diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-19 17:03:08 +0000 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2001-10-19 17:03:08 +0000 |
| commit | 6430e6e2831dc35a6e45bf09baac8c0c212d71d7 (patch) | |
| tree | e5234f3c880c5c4b9b9bd500beb11adc0918ccf7 /src/backend/utils/init/miscinit.c | |
| parent | 3d510653a4fab918451083b83ad4b667406ccda4 (diff) | |
| download | postgresql-6430e6e2831dc35a6e45bf09baac8c0c212d71d7.tar.gz postgresql-6430e6e2831dc35a6e45bf09baac8c0c212d71d7.zip | |
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.
Diffstat (limited to 'src/backend/utils/init/miscinit.c')
| -rw-r--r-- | src/backend/utils/init/miscinit.c | 8 |
1 files changed, 3 insertions, 5 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); |