summaryrefslogtreecommitdiffstats
path: root/src/engine/SCons/Script
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2002-02-10 12:58:31 (GMT)
committerSteven Knight <knight@baldmt.com>2002-02-10 12:58:31 (GMT)
commitfb0bf9a521b17a2cdcc0530cf443ebe12ccae1a4 (patch)
tree603c68523d5c9a324524c29c46a86a5de2853b10 /src/engine/SCons/Script
parente61588a4fbb9ffb27d04b1215dc2558ee38612b9 (diff)
downloadSCons-fb0bf9a521b17a2cdcc0530cf443ebe12ccae1a4.zip
SCons-fb0bf9a521b17a2cdcc0530cf443ebe12ccae1a4.tar.gz
SCons-fb0bf9a521b17a2cdcc0530cf443ebe12ccae1a4.tar.bz2
Allow the exported variables in an SConscript() call to be a UserList, too.
Diffstat (limited to 'src/engine/SCons/Script')
-rw-r--r--src/engine/SCons/Script/SConscript.py10
1 files changed, 6 insertions, 4 deletions
diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index de767ef..7210bed 100644
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -28,14 +28,16 @@ files.
# WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
#
-__revision__ = "src/engine/SCons/SConscript.py __REVISION__ __DATE__ __DEVELOPER__"
+__revision__ = "__FILE__ __REVISION__ __DATE__ __DEVELOPER__"
-import SCons.Errors
import SCons.Builder
import SCons.Defaults
+import SCons.Environment
+import SCons.Errors
import SCons.Node
import SCons.Node.FS
-import SCons.Environment
+import SCons.Util
+
import string
import sys
@@ -61,7 +63,7 @@ class Frame:
self.exports = {} # exports from the calling SConscript
try:
- if type(exports) == type([]):
+ if SCons.Util.is_List(exports):
for export in exports:
self.exports[export] = stack[-1].globals[export]
else: