Fix Import('*')

git-svn-id: http://scons.tigris.org/svn/scons/trunk@711 fdb21ef1-2011-0410-befe-b5e4ea1792b1

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index 5394985151cd448df6745c2b6bbc7ec6cc3c923d..3c38ecf1c69e2815041d9c66a40d70031daed273 100644 (file)
--- 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 0b3aa41aa615d33ab9ff791174e4396b5bb77854..5f7f4b5d34bce27631b9f190918b3dafbe497f8b 100644 (file)
--- 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 a290d070bce297496ec5fbfc61265590cecc49d2..34aaa052a0dce56cfd1251e5176a76b45d2e3c68 100644 (file)
--- a/test/SConscript.py
+++ b/test/SConscript.py
@@ -343,4 +343,6 @@ assert x == 'x'
 assert y == 'zoom'
 """)
 
+test.run(arguments = ".")
+
 test.pass_test()