]> granicus.if.org Git - postgresql/commitdiff
Fix unportable shell-script syntax in pg_upgrade's test.sh.
authorTom Lane <tgl@sss.pgh.pa.us>
Mon, 17 Mar 2014 01:55:06 +0000 (21:55 -0400)
committerTom Lane <tgl@sss.pgh.pa.us>
Mon, 17 Mar 2014 01:55:32 +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

index a109b5b196349b984353b149f1115685980f7449..21a44b4b4490ec2f6604adc6bc876db550137bf2 100644 (file)
@@ -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