diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CHANGES.txt | 4 | ||||
| -rw-r--r-- | src/engine/SCons/Script/SConscript.py | 4 |
2 files changed, 6 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] |