Print "scons: Build interrupted." on stderr, not stdout.

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

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index b6116ed49b85c4d22b03fe3642bb6bb0655983a6..8fca66386ef33b5d359417821d8ddff8c367d857 100644 (file)
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -10,6 +10,11 @@
 
 RELEASE 1.X - XXX
 
+  From Steven Knight:
+
+    - Print the message, "scons: Build interrupted." on error output,
+      not standard output.
+
   From Matthew Wesley:
 
     - Copy file attributes so we identify, and can link a shared library

diff --git a/src/engine/SCons/Script/Main.py b/src/engine/SCons/Script/Main.py
index db712e6e16e85d5a585beaaeca21edc4728002d4..6cd57cebc9c7e7c191e9d1cacaad708ef7a56290 100644 (file)
--- a/src/engine/SCons/Script/Main.py
+++ b/src/engine/SCons/Script/Main.py
@@ -1164,7 +1164,8 @@ def _build_targets(fs, options, targets, target_top):
         failure_message=failure_message
         ):
         if jobs.were_interrupted():
-            progress_display("scons: Build interrupted.")
+            if not options.no_progress and not options.silent:
+                sys.stderr.write("scons: Build interrupted.\n")
             global exit_status
             global this_build_status
             exit_status = 2

diff --git a/test/KeyboardInterrupt.py b/test/KeyboardInterrupt.py
index d5010dd1f0749d46bb807653cf84938de2bd2ac3..f19c2c0e9e4f76004f7e8594e30702459e8b6e3e 100644 (file)
--- a/test/KeyboardInterrupt.py
+++ b/test/KeyboardInterrupt.py
@@ -87,8 +87,6 @@ Default( Alias('all', all))
 
 interruptedStr = """\
 .*\
-scons: Build interrupted\\.
-.*\
 scons: building terminated because of errors\\.
 .*\
 scons: writing .sconsign file\\.
@@ -98,7 +96,9 @@ scons: writing .sconsign file\\.
 def runtest(arguments):
     test.run(arguments='-c')
     test.run(arguments=arguments, status=2,
-             stdout=interruptedStr, stderr=r'.*', match=TestSCons.match_re_dotall)
+             stdout=interruptedStr,
+             stderr='.*scons: Build interrupted\\.',
+             match=TestSCons.match_re_dotall)
 
 for i in range(2):
     runtest('-j1')