Better fix for #2530: dont exit at all on unimplemented options, just print a warning...

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

diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py
index e698f4eaaa000320ec4b245d4851eba75c4188bb..00328ed85f703264b5ddcf3192a834e71bc6080f 100644 (file)
--- a/QMTest/TestSCons.py
+++ b/QMTest/TestSCons.py
@@ -419,7 +419,6 @@ class TestSCons(TestCommon):
         """
         msg = "Warning:  the %s option is not yet implemented\n" % option
         kw['stderr'] = msg
-        kw['status'] = 1
         if arguments:
             # If it's a long option and the argument string begins with '=',
             # it's of the form --foo=bar and needs no separating space.

diff --git a/src/engine/SCons/Script/SConsOptions.py b/src/engine/SCons/Script/SConsOptions.py
index 35165a05493fe85e71da5b1ba802e8783607169d..1ffcc83054a3ec4decd188f92a81a7b7efec4bba 100644 (file)
--- a/src/engine/SCons/Script/SConsOptions.py
+++ b/src/engine/SCons/Script/SConsOptions.py
@@ -870,8 +870,6 @@ def Parser(version):
     def opt_not_yet(option, opt, value, parser):
         msg = "Warning:  the %s option is not yet implemented\n" % opt
         sys.stderr.write(msg)
-        sys.exit(1)
-
 
     op.add_option('-l', '--load-average', '--max-load',
                   nargs=1, type="int",