NotificationsYou must be signed in to change notification settings
Fork28
Star151

Commit505b2ec

committed

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

1 parent094616e commit505b2ecCopy full SHA for 505b2ec

File tree

1 file changed

-3

lines changed

src/bin/pg_dump
- pg_upgrade

1 file changed

-3

lines changed

`‎src/bin/pg_dump/pg_upgrade‎`

Lines changed: 5 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -29,8 +29,9 @@ OLDDIR="$1"`
`29`	`29`
`30`	`30`	`# check things`
`31`	`31`
`32`		`-if [!-f"./lib/global1.bki.source" ]`
`33`		`-thenecho"$0 must be run from the top of the postgres directory tree."1>&2`
	`32`	`+if [!-f"./data/PG_VERSION" ]`
	`33`	+thenecho"`basename$0` must be run from the directory containing
	`34`	+the database directory\`data' (`dirname$PGDATA`.)"1>&2
`34`	`35`	`exit 1`
`35`	`36`	`fi`
`36`	`37`
`@@ -72,7 +73,8 @@ cat $INPUT \| awk '{`
`72`	`73`	`psql"template1"<"/tmp/$$"`
`73`	`74`
`74`	`75`	`if [$?-ne 0 ]`
`75`		`-thenecho"psql failed to execute$INPUT script."1>&2`
	`76`	`+thenecho"There were errors in the input script$INPUT.`
	`77`	`+$0 aborted."1>&2`
`76`	`78`	`exit 1`
`77`	`79`	`fi`
`78`	`80`

0 commit comments

Comments

(0)

Movatterモバイル変換

Navigation Menu

Search code, repositories, users, issues, pull requests...

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Commit505b2ec

File tree

1 file changed

1 file changed

`‎src/bin/pg_dump/pg_upgrade‎`

0 commit comments