Fix error reporting in reindexdb

When failing to reindex a table or an index, reindexdb would generate an
extra error message related to a database failure, which is misleading.

Backpatch all the way down, as this has been introduced by 85e9a5a0.

Discussion: https://postgr.es/m/CAOBaU_Yo61RwNO3cW6WVYWwH7EYMPuexhKqufb2nFGOdunbcHw@mail.gmail.com
Author: Julien Rouhaud
Reviewed-by: Daniel Gustafsson, Álvaro Herrera, Tom Lane, Michael
Paquier
Backpatch-through: 9.4

diff --git a/src/bin/scripts/reindexdb.c b/src/bin/scripts/reindexdb.c
index cdfb1156413282f188b4bbb9659367bb70840c7e..c9f689ace461ae2039609150135e6f907bf82802 100644 (file)
--- a/src/bin/scripts/reindexdb.c
+++ b/src/bin/scripts/reindexdb.c
@@ -307,10 +307,10 @@ reindex_one_database(const char *name, const char *dbname, const char *type,
                if (strcmp(type, "TABLE") == 0)
                        fprintf(stderr, _("%s: reindexing of table \"%s\" in database \"%s\" failed: %s"),
                                        progname, name, PQdb(conn), PQerrorMessage(conn));
-               if (strcmp(type, "INDEX") == 0)
+               else if (strcmp(type, "INDEX") == 0)
                        fprintf(stderr, _("%s: reindexing of index \"%s\" in database \"%s\" failed: %s"),
                                        progname, name, PQdb(conn), PQerrorMessage(conn));
-               if (strcmp(type, "SCHEMA") == 0)
+               else if (strcmp(type, "SCHEMA") == 0)
                        fprintf(stderr, _("%s: reindexing of schema \"%s\" in database \"%s\" failed: %s"),
                                        progname, name, PQdb(conn), PQerrorMessage(conn));
                else