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 1a5284e5264e3256e8635c9bf215ebf151653316..5406a98c8387c3af5f81d2c14d923cc42b894b66 100644 (file)
--- 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;
 }