From: Bruce Momjian <bruce@momjian.us>
Date: Fri, 28 Oct 2011 12:07:30 +0000 (-0400)
Subject: Clarify pg_upgrade error message that the 'postgres' database must exist
X-Git-Tag: REL9_2_BETA1~922
X-Git-Url: http://git.postgresql.org/gitweb/?a=commitdiff_plain;h=9846dcfb9e8273d2ef93a1650225d013a1436349;p=postgresql.git

Clarify pg_upgrade error message that the 'postgres' database must exist
in the old cluster.
---

diff --git a/contrib/pg_upgrade/check.c b/contrib/pg_upgrade/check.c
index 5b9b4cd3d5a..e400814617b 100644
--- a/contrib/pg_upgrade/check.c
+++ b/contrib/pg_upgrade/check.c
@@ -403,8 +403,13 @@ check_old_cluster_has_new_cluster_dbs(void)
 					   new_cluster.dbarr.dbs[new_dbnum].db_name) == 0)
 				break;
 		if (old_dbnum == old_cluster.dbarr.ndbs)
-			pg_log(PG_FATAL, "New cluster database \"%s\" does not exist in the old cluster\n",
-				   new_cluster.dbarr.dbs[new_dbnum].db_name);
+		{
+			if (strcmp(new_cluster.dbarr.dbs[new_dbnum].db_name, "postgres") == 0)
+				pg_log(PG_FATAL, "The \"postgres\" database must exist in the old cluster\n");
+			else
+				pg_log(PG_FATAL, "New cluster database \"%s\" does not exist in the old cluster\n",
+					   new_cluster.dbarr.dbs[new_dbnum].db_name);
+		}
 	}
 }