Fix ARGUMENTS specifications on the command line that have multiple = in them. ...

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index f03e7bd2cbff011cba207910c86c8d7a92caaa08..ffcfe919bdfa4d6f639b10d1312eff30c1a1c590 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -84,6 +84,10 @@ RELEASE 0.95 - XXX
     of them from cache, not just the first target, and exec the build
     command if any of the targets isn't present in the cache.
 
+  From Zephaniah Hull:
+
+  - Fix command-line ARGUMENTS with multiple = in them.
+
   From Steven Knight:
 
   - Fix EnsureSConsVersion() so it checks against the SCons version,

diff --git a/src/engine/SCons/Script/SConscript.py b/src/engine/SCons/Script/SConscript.py
index 521429f23a81d2324563b55bff095f38233d91ef..90e1fe1751fe4fe809202f83c316d354ecb105a6 100644 (file)
--- a/src/engine/SCons/Script/SConscript.py
+++ b/src/engine/SCons/Script/SConscript.py
@@ -86,7 +86,7 @@ sconscript_reading = 0
 
 def _scons_add_args(alist):
     for arg in alist:
-        a, b = string.split(arg, '=', 2)
+        a, b = string.split(arg, '=', 1)
         Arguments[a] = b
 
 def _scons_add_targets(tlist):

diff --git a/test/ARGUMENTS.py b/test/ARGUMENTS.py
index ab1f806d557473d0ba2609252cf8dcf485d07966..69947a66b90a1dc997a6a00b5566370f3c7746f4 100644 (file)
--- a/test/ARGUMENTS.py
+++ b/test/ARGUMENTS.py
@@ -37,11 +37,12 @@ for k in keys:
 foo.close()
 """)
 
-test.run(arguments='a=1 bz=3 xx=sd .')
+test.run(arguments='a=1 bz=3 xx=sd zzz=foo=bar .')
 
 test.fail_test(test.read('foo.out') != """a = 1
 bz = 3
 xx = sd
+zzz = foo=bar
 """)
 
 test.pass_test()