From 505b2ecdf4bcc990bb352fe7619283c0f334a295 Mon Sep 17 00:00:00 2001
From: Bruce Momjian <bruce@momjian.us>
Date: Mon, 7 Jun 1999 22:58:31 +0000
Subject: [PATCH] I attach a patch for pg_upgrade.  This does two things:

1. check whether the program is being executed in $PGDATA/..  This is
   necessary if the data tree is not in the standard place, as is the
   case with the Debian distribution (because of Debian policy).

2. give a clearer error message if the dumped data structure fails to
   be loaded.

Oliver Elphick
---
 src/bin/pg_dump/pg_upgrade | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/bin/pg_dump/pg_upgrade b/src/bin/pg_dump/pg_upgrade
index 22eff82325..e566a912ba 100755
--- a/src/bin/pg_dump/pg_upgrade
+++ b/src/bin/pg_dump/pg_upgrade
@@ -29,8 +29,9 @@ OLDDIR="$1"
 
 # check things
 
-if [ ! -f "./lib/global1.bki.source" ]
-then	echo "$0 must be run from the top of the postgres directory tree." 1>&2
+if [ ! -f "./data/PG_VERSION" ]
+then	echo "`basename $0` must be run from the directory containing
+the database directory \`data' (`dirname $PGDATA`.)" 1>&2
 	exit 1
 fi
 
@@ -72,7 +73,8 @@ cat $INPUT | awk '	{
 psql "template1" <"/tmp/$$"
 
 if [ $? -ne 0 ]
-then	echo "psql failed to execute $INPUT script." 1>&2
+then	echo "There were errors in the input script $INPUT.
+$0 aborted." 1>&2
 	exit 1
 fi
 
-- 
2.40.0