diff options
| author | Tom Lane <tgl@sss.pgh.pa.us> | 2014-03-16 21:55:10 -0400 |
|---|---|---|
| committer | Tom Lane <tgl@sss.pgh.pa.us> | 2014-03-16 21:55:10 -0400 |
| commit | d24d6691930e5f3a95e9daece2f299a076c80c15 (patch) | |
| tree | 9e1f18f21b86e3e4f32d2a733c5d61c95013743e | |
| parent | 0bdeb1d51d910e0e19dec3ce0396903ae7de5c74 (diff) | |
| download | postgresql-d24d6691930e5f3a95e9daece2f299a076c80c15.tar.gz postgresql-d24d6691930e5f3a95e9daece2f299a076c80c15.zip | |
Fix unportable shell-script syntax in pg_upgrade's test.sh.
I discovered the hard way that on some old shells, the locution
FOO="" unset FOO
does not behave the same as
FOO=""; unset FOO
and in fact leaves FOO set to an empty string. test.sh was inconsistently
spelling it different ways on adjacent lines.
This got broken relatively recently, in commit c737a2e56, so the lack of
field reports to date doesn't represent a lot of evidence that the problem
is rare.
| -rw-r--r-- | contrib/pg_upgrade/test.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh index 3be0304d16f..28130f16010 100644 --- a/contrib/pg_upgrade/test.sh +++ b/contrib/pg_upgrade/test.sh @@ -76,10 +76,10 @@ rm -rf "$BASE_PGDATA" "$PGDATA" PGDATABASE=""; unset PGDATABASE PGUSER=""; unset PGUSER PGSERVICE=""; unset PGSERVICE -PGSSLMODE="" unset PGSSLMODE +PGSSLMODE=""; unset PGSSLMODE PGREQUIRESSL=""; unset PGREQUIRESSL PGCONNECT_TIMEOUT=""; unset PGCONNECT_TIMEOUT -PGHOST="" unset PGHOST +PGHOST=""; unset PGHOST PGHOSTADDR=""; unset PGHOSTADDR logdir=$PWD/log |