From ba5d88c5d08fc60d02eeeb65f85c6de9a95584c6 Mon Sep 17 00:00:00 2001
From: Steven Knight <knight@baldmt.com>
Date: Fri, 13 Jun 2003 03:12:15 +0000
Subject: Fix Import('*')

---
 src/CHANGES.txt                       | 4 ++++
 src/engine/SCons/Script/SConscript.py | 4 ++--
 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()
-- 
cgit v0.12