From 3f0d3576e54c5fdc1cb3822365a856736a96790e Mon Sep 17 00:00:00 2001 From: Gary Oberbrunner Date: Wed, 16 Dec 2009 02:29:54 +0000 Subject: Better fix for #2530: dont exit at all on unimplemented options, just print a warning and keep going. --- 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 e698f4e..00328ed 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 35165a0..1ffcc83 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", -- cgit v0.12