From b2b07a83ffc95ea4d5c3a604a9a1c9b783854288 Mon Sep 17 00:00:00 2001 From: garyo Date: Wed, 16 Dec 2009 02:29:54 +0000 Subject: [PATCH] Better fix for #2530: dont exit at all on unimplemented options, just print a warning and keep going. git-svn-id: http://scons.tigris.org/svn/scons/trunk@4553 fdb21ef1-2011-0410-befe-b5e4ea1792b1 --- QMTest/TestSCons.py | 1 - src/engine/SCons/Script/SConsOptions.py | 2 -- 2 files changed, 3 deletions(-) diff --git a/QMTest/TestSCons.py b/QMTest/TestSCons.py index e698f4ea..00328ed8 100644 --- 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 35165a05..1ffcc830 100644 --- 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", -- 2.26.2