Message improvements

petere · petere · commit c8d45152fa04 · 2011-05-24T21:35:06.000+03:00
diff --git a/src/bin/pg_basebackup/pg_basebackup.c b/src/bin/pg_basebackup/pg_basebackup.c
@@ -574,7 +574,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 					if (symlink(&copybuf[157], fn) != 0)
 					{
 						fprintf(stderr,
-								_("%s: could not create symbolic link from %s to %s: %s\n"),
+								_("%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"),
 								progname, fn, &copybuf[157], strerror(errno));
 						disconnect_and_exit(1);
 					}
@@ -659,7 +659,7 @@ ReceiveAndUnpackTarFile(PGconn *conn, PGresult *res, int rownum)
 
 	if (file != NULL)
 	{
-		fprintf(stderr, _("%s: last file was never finished\n"), progname);
+		fprintf(stderr, _("%s: COPY stream ended before last file was finished\n"), progname);
 		disconnect_and_exit(1);
 	}
 
@@ -780,7 +780,7 @@ BaseBackup(void)
 
 	if (PQsendQuery(conn, current_path) == 0)
 	{
-		fprintf(stderr, _("%s: could not start base backup: %s"),
+		fprintf(stderr, _("%s: could not send base backup command: %s"),
 				progname, PQerrorMessage(conn));
 		disconnect_and_exit(1);
 	}
@@ -876,7 +876,7 @@ BaseBackup(void)
 	res = PQgetResult(conn);
 	if (PQresultStatus(res) != PGRES_TUPLES_OK)
 	{
-		fprintf(stderr, _("%s: could not get end xlog position from server\n"),
+		fprintf(stderr, _("%s: could not get WAL end position from server\n"),
 				progname);
 		disconnect_and_exit(1);
 	}

Original file line number	Diff line number	Diff line change
`@@ -574,7 +574,7 @@ ReceiveAndUnpackTarFile(PGconn conn, PGresult res, int rownum)`
`574`	`574`	`if (symlink(&copybuf[157], fn) != 0)`
`575`	`575`	`{`
`576`	`576`	`fprintf(stderr,`
`577`		`- _("%s: could not create symbolic link from %s to %s: %s\n"),`
	`577`	`+ _("%s: could not create symbolic link from \"%s\" to \"%s\": %s\n"),`
`578`	`578`	`progname, fn, &copybuf[157], strerror(errno));`
`579`	`579`	`disconnect_and_exit(1);`
`580`	`580`	`}`
`@@ -659,7 +659,7 @@ ReceiveAndUnpackTarFile(PGconn conn, PGresult res, int rownum)`
`659`	`659`
`660`	`660`	`if (file != NULL)`
`661`	`661`	`{`
`662`		`- fprintf(stderr, _("%s: last file was never finished\n"), progname);`
	`662`	`+ fprintf(stderr, _("%s: COPY stream ended before last file was finished\n"), progname);`
`663`	`663`	`disconnect_and_exit(1);`
`664`	`664`	`}`
`665`	`665`
`@@ -780,7 +780,7 @@ BaseBackup(void)`
`780`	`780`
`781`	`781`	`if (PQsendQuery(conn, current_path) == 0)`
`782`	`782`	`{`
`783`		`- fprintf(stderr, _("%s: could not start base backup: %s"),`
	`783`	`+ fprintf(stderr, _("%s: could not send base backup command: %s"),`
`784`	`784`	`progname, PQerrorMessage(conn));`
`785`	`785`	`disconnect_and_exit(1);`
`786`	`786`	`}`
`@@ -876,7 +876,7 @@ BaseBackup(void)`
`876`	`876`	`res = PQgetResult(conn);`
`877`	`877`	`if (PQresultStatus(res) != PGRES_TUPLES_OK)`
`878`	`878`	`{`
`879`		`- fprintf(stderr, _("%s: could not get end xlog position from server\n"),`
	`879`	`+ fprintf(stderr, _("%s: could not get WAL end position from server\n"),`
`880`	`880`	`progname);`
`881`	`881`	`disconnect_and_exit(1);`
`882`	`882`	`}`