Ensure that all startup paths (postmaster, standalone postgres, or

bootstrap) check for a valid PG_VERSION file before looking at anything
else in the data directory.  This fixes confusing error report when
trying to start current sources in a pre-7.1 data directory.
Per trouble report from Rich Shepard 10/18/01.

2 files changed, 5 insertions, 13 deletions

diff --git a/src/backend/utils/init/miscinit.c b/src/backend/utils/init/miscinit.c
index 6f6bc5f9fd3..2513d74f763 100644
--- a/src/backend/utils/init/miscinit.c
+++ b/src/backend/utils/init/miscinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.78 2001/10/12 02:08:34 ishii Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/miscinit.c,v 1.79 2001/10/19 17:03:08 tgl Exp $
  *
  *-------------------------------------------------------------------------
  */
@@ -912,10 +912,8 @@ ValidatePgVersion(const char *path)
 	}
 
 	ret = fscanf(file, "%ld.%ld", &file_major, &file_minor);
-	if (ret == EOF)
-		elog(FATAL, "cannot read %s: %m", full_path);
-	else if (ret != 2)
-		elog(FATAL, "`%s' does not have a valid format. You need to initdb.", full_path);
+	if (ret != 2)
+		elog(FATAL, "File %s does not contain valid data. You need to initdb.", full_path);
 
 	FreeFile(file);
 
diff --git a/src/backend/utils/init/postinit.c b/src/backend/utils/init/postinit.c
index 47926b146f5..f653f556401 100644
--- a/src/backend/utils/init/postinit.c
+++ b/src/backend/utils/init/postinit.c
@@ -8,7 +8,7 @@
  *
  *
  * IDENTIFICATION
- *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.93 2001/09/29 04:02:25 tgl Exp $
+ *	  $Header: /cvsroot/pgsql/src/backend/utils/init/postinit.c,v 1.94 2001/10/19 17:03:08 tgl Exp $
  *
  *
  *-------------------------------------------------------------------------
@@ -221,13 +221,7 @@ InitPostgres(const char *dbname, const char *username)
 		char	   *fullpath,
 					datpath[MAXPGPATH];
 
-		/* Verify if DataDir is ok */
-		if (access(DataDir, F_OK) == -1)
-			elog(FATAL, "Database system not found.\n\t"
-				 "Data directory '%s' does not exist.",
-				 DataDir);
-
-		ValidatePgVersion(DataDir);
+		/* Formerly we validated DataDir here, but now that's done earlier. */
 
 		/*
 		 * Find oid and path of the database we're about to open. Since