From: Robert Haas <rhaas@postgresql.org>
Date: Wed, 21 Mar 2012 14:56:26 +0000 (-0400)
Subject: Improve connectMaintenanceDatabase() error reporting.
X-Git-Tag: REL9_2_BETA1~249
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=99081c63e40ac6e33c83406b0958aa9426193fea;p=thirdparty%2Fpostgresql.git

Improve connectMaintenanceDatabase() error reporting.

The prior coding instructs the user to pick an alternative maintenance
database, but this is overly clever, since it obscures whatever the real
cause of the failure is.

Josh Kupershmidt
---

diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c
index 1a5284e5264..5406a98c838 100644
--- a/src/bin/scripts/common.c
+++ b/src/bin/scripts/common.c
@@ -197,17 +197,7 @@ connectMaintenanceDatabase(const char *maintenance_db, const char *pghost,
 						   progname, true);
 	if (!conn)
 		conn = connectDatabase("template1", pghost, pgport, pguser,
-							   prompt_password, progname, true);
-
-	if (!conn)
-	{
-		fprintf(stderr, _("%s: could not connect to databases \"postgres\" or \"template1\"\n"
-						  "Please specify an alternative maintenance database.\n"),
-				progname);
-		fprintf(stderr, _("Try \"%s --help\" for more information.\n"),
-				progname);
-		exit(1);
-	}
+							   prompt_password, progname, false);
 
 	return conn;
 }