summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Knight <knight@baldmt.com>2008-08-22 03:57:57 (GMT)
committerSteven Knight <knight@baldmt.com>2008-08-22 03:57:57 (GMT)
commit39809dc4d7d93be6092ca93b00e3d81ba449e0f4 (patch)
treef06a5546ec46fef814df9253601b39c82f0f0662
parentc93f843acfc89d863dd9495fe67195061f2dd515 (diff)
downloadSCons-39809dc4d7d93be6092ca93b00e3d81ba449e0f4.zip
SCons-39809dc4d7d93be6092ca93b00e3d81ba449e0f4.tar.gz
SCons-39809dc4d7d93be6092ca93b00e3d81ba449e0f4.tar.bz2
The parallel message should be returned from that function, not printed
directly. This allows it to be disabled by the right --warn= option.
-rw-r--r--src/engine/SCons/Script/Main.py5
1 files changed, 2 insertions, 3 deletions
diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 6c15398..e247634 100644
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -78,7 +78,7 @@ def fetch_win32_parallel_msg():
# globl in nest scopes and UnboundLocalErrors and the like in some
# versions (2.1) of Python.
import SCons.Platform.win32
- print SCons.Platform.win32.parallel_msg
+ return SCons.Platform.win32.parallel_msg
#
@@ -110,8 +110,7 @@ class Progressor:
elif SCons.Util.is_List(obj):
self.func = self.spinner
elif string.find(obj, self.target_string) != -1:
- self.func = self.replace_string
- else:
+ self.func = self.replace_string else:
self.func = self.string
def write(self, s):