diff options
| author | Steven Knight <knight@baldmt.com> | 2008-12-10 16:20:12 (GMT) |
|---|---|---|
| committer | Steven Knight <knight@baldmt.com> | 2008-12-10 16:20:12 (GMT) |
| commit | b4d7c306c8e6b42a04b71dacb7ce829713e9d106 (patch) | |
| tree | 3074956643cc0c0533f04e31587edd973ffc26bc | |
| parent | 2766fe209f8a25295455956337a4b1ff9730e32e (diff) | |
| download | SCons-b4d7c306c8e6b42a04b71dacb7ce829713e9d106.zip SCons-b4d7c306c8e6b42a04b71dacb7ce829713e9d106.tar.gz SCons-b4d7c306c8e6b42a04b71dacb7ce829713e9d106.tar.bz2 | |
Print "scons: Build interrupted." on stderr, not stdout.
| -rw-r--r-- | src/CHANGES.txt | 5 | ||||
| -rw-r--r-- | src/engine/SCons/Script/Main.py | 3 | ||||
| -rw-r--r-- | test/KeyboardInterrupt.py | 6 |
3 files changed, 10 insertions, 4 deletions
diff --git a/src/CHANGES.txt b/src/CHANGES.txt index b6116ed..8fca663 100644 --- 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 db712e6..6cd57ce 100644 --- 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 d5010dd..f19c2c0 100644 --- 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') |