From 1d62e7e30f072495d71ff5273f362cfa201c7515 Mon Sep 17 00:00:00 2001 From: Gregory Szorc Date: Thu, 28 Feb 2013 14:25:10 -0800 Subject: [PATCH] Bug 845089 - Followup: Handle Windows paths when detecting external source directories; r=khuey This is related to work that landed in part 20 of bug 784841. --- python/mozbuild/mozbuild/frontend/reader.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/python/mozbuild/mozbuild/frontend/reader.py b/python/mozbuild/mozbuild/frontend/reader.py index e8e6b1beaf68..ec624164ae85 100644 --- a/python/mozbuild/mozbuild/frontend/reader.py +++ b/python/mozbuild/mozbuild/frontend/reader.py @@ -118,11 +118,14 @@ class MozbuildSandbox(Sandbox): self.config = config topobjdir = os.path.abspath(config.topobjdir) - topsrcdir = config.topsrcdir - if not path.startswith(topsrcdir): + norm_topsrcdir = os.path.normpath(topsrcdir) + + if not path.startswith(norm_topsrcdir): external_dirs = config.substs.get('EXTERNAL_SOURCE_DIR', '').split() for external in external_dirs: + external = os.path.normpath(external) + if not os.path.isabs(external): external = os.path.join(config.topsrcdir, external)