Fix a bug when BuildDir(duplicate=0) is used with multiple SConscript files. (Charles Crain)

2 files changed, 24 insertions, 4 deletions

diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py
index 0afc3d8..f380f7e 100644
--- a/src/engine/SCons/Node/FS.py
+++ b/src/engine/SCons/Node/FS.py
@@ -557,10 +557,15 @@ class FS:
         to match.
         """
         self.__setTopLevelDir()
-        if not dir is None:
-            self._cwd = dir
-            if change_os_dir:
-                os.chdir(dir.abspath)
+        curr=self._cwd
+        try:
+            if not dir is None:
+                self._cwd = dir
+                if change_os_dir:
+                    os.chdir(dir.abspath)
+        except:
+            self._cwd = curr
+            raise
 
     def Entry(self, name, directory = None, create = 1, klass=None):
         """Lookup or create a generic Entry node with the specified name.
@@ -640,6 +645,13 @@ class FS:
             n = self.__doLookup(clazz, name, d)
             if n.exists():
                 return n
+            if isinstance(n, Dir):
+                # If n is a Directory that has Repositories directly
+                # attached to it, then any of those is a valid Repository
+                # path.  Return the first one that exists.
+                reps = filter(lambda x: x.exists(), n.getRepositories())
+                if len(reps):
+                    return reps[0]
             d = n.get_dir()
             name = n.name
             # Search repositories of all directories that this file is under.
diff --git a/src/engine/SCons/Node/FSTests.py b/src/engine/SCons/Node/FSTests.py
index 0bba0ed..7836a13 100644
--- a/src/engine/SCons/Node/FSTests.py
+++ b/src/engine/SCons/Node/FSTests.py
@@ -378,6 +378,14 @@ class BuildDirTestCase(unittest.TestCase):
             test.unlink( "src/foo" )
             test.unlink( "build/foo" )
 
+        # Test against a former bug.  Make sure we can get a repository
+        # path for the build directory itself!
+        fs=SCons.Node.FS.FS(test.workpath('work'))
+        test.subdir('work')
+        fs.BuildDir('build/var3', 'src', duplicate=0)
+        d1 = fs.Dir('build/var3')
+        assert d1.rdir() == fs.Dir('src'), str(d1.rdir())
+
         # verify the link creation attempts in file_link()
         class LinkSimulator :
             """A class to intercept os.[sym]link() calls and track them."""