diff options
| author | Gary Oberbrunner <garyo@oberbrunner.com> | 2008-09-03 02:44:51 (GMT) |
|---|---|---|
| committer | Gary Oberbrunner <garyo@oberbrunner.com> | 2008-09-03 02:44:51 (GMT) |
| commit | 63265fa6cd288b04e479230ca51d2842f4f0c81b (patch) | |
| tree | 23e3076a52ab5bdc141c1b4663f7c8eca3e11e48 /src | |
| parent | e8f9df6d48ac1cbda382e95600a2a48f8fd5de86 (diff) | |
| download | SCons-63265fa6cd288b04e479230ca51d2842f4f0c81b.zip SCons-63265fa6cd288b04e479230ca51d2842f4f0c81b.tar.gz SCons-63265fa6cd288b04e479230ca51d2842f4f0c81b.tar.bz2 | |
Fix for bug #2184, Glob() corrupts LIBPATH.
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 7 | ||||
| -rw-r--r-- | src/engine/SCons/Node/FS.py | 4 |
2 files changed, 9 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 5855053..7045b0f 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -8,6 +8,13 @@ +RELEASE 1.X - XXX + + From Ian P. Cardenas: + + - Fix Glob() polluting LIBPATH by returning copy of list + + RELEASE 1.0.0 - XXX From Jared Grubb: diff --git a/src/engine/SCons/Node/FS.py b/src/engine/SCons/Node/FS.py index 6165873..a2c7244 100644 --- a/src/engine/SCons/Node/FS.py +++ b/src/engine/SCons/Node/FS.py @@ -1411,7 +1411,7 @@ class Dir(Base): def get_all_rdirs(self): try: - return self._memo['get_all_rdirs'] + return list(self._memo['get_all_rdirs']) except KeyError: pass @@ -1427,7 +1427,7 @@ class Dir(Base): fname = dir.name + os.sep + fname dir = dir.up() - self._memo['get_all_rdirs'] = result + self._memo['get_all_rdirs'] = list(result) return result |