Commit380d1ee

committed

Update error messages, per notes from Tom.

Laurenz Albe

1 parent1975090 commit380d1eeCopy full SHA for 380d1ee

File tree

-8

lines changed

-8

lines changed

Lines changed: 4 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`8`	`8`	`* Portions Copyright (c) 1994, Regents of the University of California`
`9`	`9`	`*`
`10`		`- * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.299 2008/04/23 13:44:58 mha Exp $`
	`10`	`+ * $PostgreSQL: pgsql/src/backend/access/transam/xlog.c,v 1.300 2008/04/24 14:23:43 mha Exp $`
`11`	`11`	`*`
`12`	`12`	`*-------------------------------------------------------------------------`
`13`	`13`	`*/`
`@@ -7101,14 +7101,15 @@ CancelBackup(void)`
`7101`	`7101`	`{`
`7102`	`7102`	`ereport(LOG,`
`7103`	`7103`	`(errmsg("online backup mode cancelled"),`
`7104`		`-errdetail("\"%s\" renamed to \"%s\"",`
	`7104`	`+errdetail("\"%s\"wasrenamed to \"%s\".",`
`7105`	`7105`	`BACKUP_LABEL_FILE,BACKUP_LABEL_OLD)));`
`7106`	`7106`	`}`
`7107`	`7107`	`else`
`7108`	`7108`	`{`
`7109`	`7109`	`ereport(WARNING,`
`7110`	`7110`	`(errcode_for_file_access(),`
`7111`		`-errmsg("could not rename \"%s\" to \"%s\", backup mode not cancelled: %m",`
	`7111`	`+errmsg("online backup mode was not cancelled"),`
	`7112`	`+errdetail("Could not rename \"%s\" to \"%s\": %m.",`
`7112`	`7113`	`BACKUP_LABEL_FILE,BACKUP_LABEL_OLD)));`
`7113`	`7114`	`}`
`7114`	`7115`	`}`

Lines changed: 5 additions & 5 deletions

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* Portions Copyright (c) 1996-2008, PostgreSQL Global Development Group`
`6`	`6`	`*`
`7`		`- * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.97 2008/04/23 13:44:59 mha Exp $`
	`7`	`+ * $PostgreSQL: pgsql/src/bin/pg_ctl/pg_ctl.c,v 1.98 2008/04/24 14:23:43 mha Exp $`
`8`	`8`	`*`
`9`	`9`	`*-------------------------------------------------------------------------`
`10`	`10`	`*/`
`@@ -767,8 +767,8 @@ do_stop(void)`
`767`	`767`	`{`
`768`	`768`	`if ((shutdown_mode==SMART_MODE)&& (stat(backup_file,&statbuf)==0))`
`769`	`769`	`{`
`770`		`-print_msg(_("WARNING: online backup mode is active; must be ended\n"`
`771`		`-" withpg_stop_backup()for shutdown to complete\n\n"));`
	`770`	`+print_msg(_("WARNING: online backup mode is active.\n"`
	`771`	`+"Shutdown will not complete untilpg_stop_backup()is called.\n\n"));`
`772`	`772`	`}`
`773`	`773`
`774`	`774`	`print_msg(_("waiting for server to shut down..."));`
`@@ -844,8 +844,8 @@ do_restart(void)`
`844`	`844`
`845`	`845`	`if ((shutdown_mode==SMART_MODE)&& (stat(backup_file,&statbuf)==0))`
`846`	`846`	`{`
`847`		`-print_msg(_("WARNING: online backup mode is active; must be ended\n"`
`848`		`-" withpg_stop_backup()for shutdown to complete\n\n"));`
	`847`	`+print_msg(_("WARNING: online backup mode is active.\n"`
	`848`	`+"Shutdown will not complete untilpg_stop_backup()is called.\n\n"));`
`849`	`849`	`}`
`850`	`850`
`851`	`851`	`print_msg(_("waiting for server to shut down..."));`

Comments

(0)