From 6d89db58d03decf271b07305fdf6adc4621a6836 Mon Sep 17 00:00:00 2001
From: Andrew McMillan <andrew@morphoss.com>
Date: Sat, 24 Sep 2011 14:29:41 +1200
Subject: [PATCH] Fix setting of PG password from administration.yml during
 upgrade.

---
 dba/update-davical-database | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dba/update-davical-database b/dba/update-davical-database
index cde577bc..e8c2fa7e 100755
--- a/dba/update-davical-database
+++ b/dba/update-davical-database
@@ -322,7 +322,7 @@ sub apply_sql_file {
   push @psql_opts, "-p", "$dbport" if ( $dbport != 5432 );
   push @psql_opts, "-U", $dbuser if ( $dbuser ne "" );
   push @psql_opts, $dbname;    # It seems that FreeBSD has a poorer argument parsing library so non-option arguments must be last
-  $ENV{'PGPASS'} = $dbpass if ( $dbpass ne "" );
+  $ENV{'PGPASSWORD'} = $dbpass if ( $dbpass ne "" );
 
   my $command = join ' ', @psql_opts;
   $last_results = `$command 2>&1 1>/dev/null`;