Update error messages, per notes from Tom.

Laurenz Albe

diff --git a/src/backend/access/transam/xlog.c b/src/backend/access/transam/xlog.c
index d23fc9b5614c696fe19e7a36aa58db8f175b0db5..df1549f97d9a3242ddce035a60e53bae49bd8469 100644 (file)
--- a/src/backend/access/transam/xlog.c
+++ b/src/backend/access/transam/xlog.c
@@ -7,7 +7,7 @@
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  * Portions Copyright (c) 1994, Regents of the University of California
  *
- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.299 2008/04/23 13:44:58 mha Exp $
+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.300 2008/04/24 14:23:43 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -7101,14 +7101,15 @@ CancelBackup(void)
        {
                ereport(LOG,
                                (errmsg("online backup mode cancelled"),
-                                errdetail("\"%s\" renamed to \"%s\"",
+                                errdetail("\"%s\" was renamed to \"%s\".",
                                                BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
        }
        else
        {
                ereport(WARNING,
                                (errcode_for_file_access(),
-                                errmsg("could not rename \"%s\" to \"%s\", backup mode not cancelled: %m",
+                                errmsg("online backup mode was not cancelled"),
+                                errdetail("Could not rename \"%s\" to \"%s\": %m.",
                                                BACKUP_LABEL_FILE, BACKUP_LABEL_OLD)));
        }
 }

diff --git a/src/bin/pg_ctl/pg_ctl.c b/src/bin/pg_ctl/pg_ctl.c
index 55319c6262b68528ae9334cd8666829a778e2783..6e0cd1a6654dfdec58abeace95830237bab18a56 100644 (file)
--- a/src/bin/pg_ctl/pg_ctl.c
+++ b/src/bin/pg_ctl/pg_ctl.c
@@ -4,7 +4,7 @@
  *
  * Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group
  *
- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.97 2008/04/23 13:44:59 mha Exp $
+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.98 2008/04/24 14:23:43 mha Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -767,8 +767,8 @@ do_stop(void)
        {
                if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0))
                {
-                       print_msg(_("WARNING: online backup mode is active; must be ended\n"
-                                               "   with pg_stop_backup() for shutdown to complete\n\n"));
+                       print_msg(_("WARNING: online backup mode is active.\n"
+                                               "Shutdown will not complete until pg_stop_backup() is called.\n\n"));
                }
 
                print_msg(_("waiting for server to shut down..."));
@@ -844,8 +844,8 @@ do_restart(void)
 
                if ((shutdown_mode == SMART_MODE) && (stat(backup_file, &statbuf) == 0))
                {
-                       print_msg(_("WARNING: online backup mode is active; must be ended\n"
-                                               "   with pg_stop_backup() for shutdown to complete\n\n"));
+                       print_msg(_("WARNING: online backup mode is active.\n"
+                                               "Shutdown will not complete until pg_stop_backup() is called.\n\n"));
                }
 
                print_msg(_("waiting for server to shut down..."));