Commit80cb26b

committed

Fix pg_controldata getopt. Fix some mistakes in pgpro_upgrade

1 parentdea6c1e commit80cb26bCopy full SHA for 80cb26b

File tree

-4

lines changed

-4

lines changed

Lines changed: 1 addition & 1 deletion

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,7 +29,7 @@ esac`
`29`	`29`
`30`	`30`	`# Check the catalog version`
`31`	`31`	`CATALOG_VERSION_NO=2016081311`
`32`		`-MAJORVER=$9.6`
	`32`	`+MAJORVER=9.6`
`33`	`33`	CATVER=`${PGBIN}pg_controldata\|sed -n'/Catalog version number:/s/^.: //p'`
`34`	`34`	`if ["$CATVER"!=$CATALOG_VERSION_NO ];then`
`35`	`35`	`if [!-f"${PGDATA}/global/pg_control" ];then`
`@@ -39,9 +39,13 @@ if [ "$CATVER" != $CATALOG_VERSION_NO ]; then`
`39`	`39`	`s/'.*$//`
`40`	`40`	p}" /etc/postgresql/9.6/main/postgresql.conf`
`41`	`41`	`if [-z"$PGDATA"-o!-f"${PGDATA}/global/pg_control" ];then`
`42`		`-echo"Cannot find valid database in$PGDATA"2>&1;`
	`42`	`+echo"Cannot find valid database in$PGDATA"1>&2;`
`43`	`43`	`exit 1`
`44`	`44`	`fi`
	`45`	`+if [-f"$PGDATA/postmaster.pid" ];then`
	`46`	`+echo"postmaster.pid exists. Is another backend running on$PGDATA"1>&2;`
	`47`	`+exit 1;`
	`48`	`+fi`
`45`	`49`	`fi`
`46`	`50`	`# Fix pg_control file`
`47`	`51`	`"${PGBIN}pg_controldata" -c`
`@@ -52,7 +56,7 @@ if [ "$CATVER" != $CATALOG_VERSION_NO ]; then`
`52`	`56`	`(cd$i; mv PG_${MAJORVER}_$CATVER PG_${MAJORVER}_$CATALOG_VERSION_NO)`
`53`	`57`	`done`
`54`	`58`	`)`
`55`		`-if [-n"$SAVE_PGDATA" ]then`
	`59`	`+if [-n"$SAVE_PGDATA" ];then`
`56`	`60`	`PGDATA="$SAVE_PGDATA"`
`57`	`61`	`fi`
`58`	`62`	`fi`

Comments

(0)