Display the help message when -u -h is supplied. (Elliot Murphy)

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index de12b2286793faed4d80ee6355a5cd7a26890602..8f198602a79399a6a9028477799dfa9891d72efc 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -221,6 +221,8 @@ RELEASE 0.97 - XXX
   - Enhance the tests to guarantee persistence of ListOption
     values in saved options files.
 
+  - Supply the help text when -h is used with the -u, -U or -D options.
+
   From Christian Neeb:
 
   - Fix the Java parser's handling of string definitions to avoid ignoring

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 71f6d61822da59447162c6762313c88075a25e3e..f50273ecd7b630e4ce0c578a07140db9756e2e37 100644 (file)
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -868,8 +868,6 @@ def _main(args, parser):
         if script_dir:
             display("scons: Entering directory `%s'" % script_dir)
             os.chdir(script_dir)
-        else:
-            raise SCons.Errors.UserError, "No SConstruct file found."
 
     fs.set_toplevel_dir(os.getcwd())
 

diff --git a/test/option-h.py b/test/option-h.py
index e70de1b3fdf1fe3b1d400900aeb869b21ca90d73..7b36c245f7037420cf049cff491bce7e8b2b6240 100644 (file)
--- a/test/option-h.py
+++ b/test/option-h.py
@@ -31,14 +31,29 @@ import sys
 test = TestSCons.TestSCons()
 
 test.run(arguments = '-h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-u -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-U -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
+test.run(arguments = '-D -h')
 test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
 test.write('SConstruct', "")
 
 test.run(arguments = '-h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-u -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
+
+test.run(arguments = '-U -h')
+test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
+test.run(arguments = '-D -h')
 test.fail_test(string.find(test.stdout(), '-h, --help') == -1)
 
 test.pass_test()
-