Make error and warning message consistent. (Anthony Roach)

3 files changed, 12 insertions, 4 deletions

diff --git a/src/CHANGES.txt b/src/CHANGES.txt
index ee47871..38fa1a7 100644
--- a/src/CHANGES.txt
+++ b/src/CHANGES.txt
@@ -22,6 +22,10 @@ RELEASE 0.10 - XXX
   - Convert the .sconsign file format from ASCII to a pickled Python
     data structure.
 
+  - Made consistent the format of error messages (now all start with
+    "scons: ***") and warning messages (now all start with "scons:
+    warning:").
+
 
 
 RELEASE 0.09 - Thu,  5 Dec 2002 04:48:25 -0600
diff --git a/src/RELEASE.txt b/src/RELEASE.txt
index 15f4ca9..60594de 100644
--- a/src/RELEASE.txt
+++ b/src/RELEASE.txt
@@ -38,6 +38,10 @@ RELEASE 0.10 - XXX
       These warnings are normal in this situation and can be safely
       ignored.
 
+    - The format of all error and warning messages has been made
+      consistent.  All error messages now begin with "scons: ***"
+      and all warning messages now begin with "scons: warning:".
+
   Please note the following important changes since release 0.08:
 
     - The SetCommandHandler() function has been superceded
diff --git a/src/engine/SCons/Script/__init__.py b/src/engine/SCons/Script/__init__.py
index a0c2f7d..c22cd37 100644
--- a/src/engine/SCons/Script/__init__.py
+++ b/src/engine/SCons/Script/__init__.py
@@ -111,7 +111,7 @@ class BuildTask(SCons.Taskmaster.Task):
         elif sys.exc_type == UserError:
             # We aren't being called out of a user frame, so
             # don't try to walk the stack, just print the error.
-            sys.stderr.write("\nSCons error: %s\n" % e)
+            sys.stderr.write("\nscons: *** %s\n" % e)
         elif sys.exc_type == StopError:
             s = str(e)
             if not keep_going_on_error:
@@ -239,7 +239,7 @@ def _scons_user_error(e):
     """
     etype, value, tb = sys.exc_info()
     filename, lineno, routine, dummy = find_deepest_user_frame(traceback.extract_tb(tb))
-    sys.stderr.write("\nSCons error: %s\n" % value)
+    sys.stderr.write("\nscons: *** %s\n" % value)
     sys.stderr.write('File "%s", line %d, in %s\n' % (filename, lineno, routine))
     sys.exit(2)
 
@@ -251,7 +251,7 @@ def _scons_user_warning(e):
     """
     etype, value, tb = sys.exc_info()
     filename, lineno, routine, dummy = find_deepest_user_frame(traceback.extract_tb(tb))
-    sys.stderr.write("\nSCons warning: %s\n" % e)
+    sys.stderr.write("\nscons: warning: %s\n" % e)
     sys.stderr.write('File "%s", line %d, in %s\n' % (filename, lineno, routine))
 
 def _scons_internal_warning(e):
@@ -259,7 +259,7 @@ def _scons_internal_warning(e):
     *current call stack* rather than sys.exc_info() to get our stack trace.
     This is used by the warnings framework to print warnings."""
     filename, lineno, routine, dummy = find_deepest_user_frame(traceback.extract_stack())
-    sys.stderr.write("\nSCons warning: %s\n" % e)
+    sys.stderr.write("\nscons: warning: %s\n" % e)
     sys.stderr.write('File "%s", line %d, in %s\n' % (filename, lineno, routine))
 
 def _scons_other_errors():