summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorWilliam Deegan <bill@baddogconsulting.com>2015-09-29 15:52:43 (GMT)
committerWilliam Deegan <bill@baddogconsulting.com>2015-09-29 15:52:43 (GMT)
commit0a76f5e2f9a3b55995014fc18881bdb068765817 (patch)
treedd9246fd1bb2f6eedf56902d2fe5efdd1d347215 /src
parent11addeb3aef797cce9414a51b4229da51f3780a1 (diff)
downloadSCons-0a76f5e2f9a3b55995014fc18881bdb068765817.zip
SCons-0a76f5e2f9a3b55995014fc18881bdb068765817.tar.gz
SCons-0a76f5e2f9a3b55995014fc18881bdb068765817.tar.bz2
Removed 'Local Build Variables:' from output when append flag for help is True. This change breaks a bunch of tests and isn't core to the bug itself
Diffstat (limited to 'src')
-rw-r--r--src/engine/SCons/Script/__init__.py14
1 files changed, 10 insertions, 4 deletions
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index 4dcd055..6bfc36f 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -269,10 +269,16 @@ def HelpFunction(text, append=False):
help_text = s.getvalue()
s.close()
else:
- help_text = ""
- help_text = help_text + "\nLocal Build Variables:\n" + text
- else:
- help_text = help_text + text
+ help_text = ""
+#
+# Was in original patch but this text is arbitrary and breaks tests
+# so I removed it (Deegan)
+# help_text = help_text + "\nLocal Build Variables:\n" + text
+# else:
+# help_text = help_text + text
+
+ help_text= help_text + text
+
#
# Will be non-zero if we are reading an SConscript file.