diff options
| author | Steven Knight <knight@baldmt.com> | 2003-06-13 03:12:15 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2003-06-13 03:12:15 (GMT) |
| commit | ba5d88c5d08fc60d02eeeb65f85c6de9a95584c6 (patch) | |
| tree | 43b71f98ae0b924cfcb73a261f85a96203635d67 | |
| parent | 823ab5a50f9856308ee9559f968d62409ad625da (diff) | |
| download | SCons-ba5d88c5d08fc60d02eeeb65f85c6de9a95584c6.zip SCons-ba5d88c5d08fc60d02eeeb65f85c6de9a95584c6.tar.gz SCons-ba5d88c5d08fc60d02eeeb65f85c6de9a95584c6.tar.bz2 | |
Fix Import('*')
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 4 | ||||
| -rw-r--r-- | test/SConscript.py | 2 |
3 files changed, 8 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index 5394985..3c38ecf 100644 --- a/src/CHANGES.txt +++ b/src/CHANGES.txt @@ -49,6 +49,10 @@ RELEASE 0.15 - XXX - Don't update the .sconsign files when run with -n. + From Anthony Roach + + - Fix Import('*'). + From David Snopek - Fix use of SConf in paths with white space in them. diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py index 0b3aa41..5f7f4b5 100644 --- a/src/engine/SCons/Script/SConscript.py +++ b/src/engine/SCons/Script/SConscript.py @@ -376,9 +376,9 @@ def Import(*vars): for var in vars: var = SCons.Util.argmunge(var) for v in var: - if 'v' == '*': + if v == '*': stack[-1].globals.update(global_exports) - stack[-1].globals.update(stack[-1].exports[v]) + stack[-1].globals.update(stack[-1].exports) else: if stack[-1].exports.has_key(v): stack[-1].globals[v] = stack[-1].exports[v] diff --git a/test/SConscript.py b/test/SConscript.py index a290d07..34aaa05 100644 --- a/test/SConscript.py +++ b/test/SConscript.py @@ -343,4 +343,6 @@ assert x == 'x' assert y == 'zoom' """) +test.run(arguments = ".") + test.pass_test() |