git.postgresql.org Git - postgresql.git/commitdiff

git projects / postgresql.git / commitdiff

Fix unportable shell-script syntax in pg_upgrade's test.sh.

2014年3月17日 01:55:02 +0000 (21:55 -0400)

2014年3月17日 01:55:27 +0000 (21:55 -0400)

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.

contrib/pg_upgrade/test.sh patch | blob | blame | history

diff --git a/contrib/pg_upgrade/test.sh b/contrib/pg_upgrade/test.sh

index 1ef80edbcbb32d457d5634b53675380276551b13..baa7d4748b6f521d5a99eb32885f2f9342abdb30 100644 (file)

--- a/contrib/pg_upgrade/test.sh

+++ b/contrib/pg_upgrade/test.sh

@@ -83,10 +83,10 @@ mkdir "$logdir"

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

# Select a non-conflicting port number, similarly to pg_regress.c

This is the main PostgreSQL git repository.

RSS Atom