summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2005-02-11 03:08:06 (GMT)
committerSteven Knight <knight@baldmt.com>2005-02-11 03:08:06 (GMT)
commitc4cf6660b5a05710dc603999010f5b4645b3f655 (patch)
treed766eefacb1b144e4b43ad946e3630502aa47778 /src
parent13706a906d814697ecfd819fc915ff0d97bf7388 (diff)
downloadSCons-c4cf6660b5a05710dc603999010f5b4645b3f655.zip
SCons-c4cf6660b5a05710dc603999010f5b4645b3f655.tar.gz
SCons-c4cf6660b5a05710dc603999010f5b4645b3f655.tar.bz2
Display the help message when -u -h is supplied. (Elliot Murphy)
Diffstat (limited to 'src')
-rw-r--r--src/CHANGES.txt2
-rw-r--r--src/engine/SCons/Script/Main.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index de12b22..8f19860 100644
--- 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 71f6d61..f50273e 100644
--- 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())