Have the closing message say ...terminated

2 files changed, 11 insertions, 1 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index f692b74..7fe5cf1 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -82,6 +82,11 @@ RELEASE X.XX - XXX
   - Split the non-SCons-specific functionality from SConf.py to a new,
     re-usable Conftest.py module.
 
+  From Marko Rauhamaa:
+
+  - Have the closing message say "...terminated because of errors" if
+    there were any.
+
   From Christoph Wiedemann:
   
   - Fix test/SWIG.py to find the Python include directory in all cases.
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index ed9216b..613f775 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -920,6 +920,7 @@ def _main(args, parser):
     task_class = BuildTask	# default action is to build targets
     opening_message = "Building targets ..."
     closing_message = "done building targets."
+    failure_message = "building terminated because of errors."
     if options.question:
         task_class = QuestionTask
     try:
@@ -937,6 +938,7 @@ def _main(args, parser):
             calc = CleanCalculator()
             opening_message = "Cleaning targets ..."
             closing_message = "done cleaning targets."
+            failure_message = "cleaning terminated because of errors."
     except AttributeError:
         pass
 
@@ -965,7 +967,10 @@ def _main(args, parser):
     try:
         jobs.run()
     finally:
-        progress_display("scons: " + closing_message)
+        if exit_status:
+            progress_display("scons: " + failure_message)
+        else:
+            progress_display("scons: " + closing_message)
         if not options.noexec:
             SCons.Sig.write()