From: stevenknight <stevenknight@fdb21ef1-2011-0410-befe-b5e4ea1792b1>
Date: Fri, 22 Aug 2008 03:57:57 +0000 (+0000)
Subject: The parallel message should be returned from that function, not printed
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=bcb1157da7e4ec5b71bfffd71a5d3c173ce48bb8;p=scons.git

The parallel message should be returned from that function, not printed
directly.  This allows it to be disabled by the right --warn= option.


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

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index 6c15398f..e2476349 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):