From 99081c63e40ac6e33c83406b0958aa9426193fea Mon Sep 17 00:00:00 2001 From: Robert Haas Date: Wed, 21 Mar 2012 10:56:26 -0400 Subject: [PATCH] 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 --- src/bin/scripts/common.c | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/src/bin/scripts/common.c b/src/bin/scripts/common.c index 1a5284e526..5406a98c83 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; } -- 2.40.0