From cedcdd82b7cd87371e938ab1cfbbfdce8b9b637c Mon Sep 17 00:00:00 2001
From: Pavel Raiskup <praiskup@redhat.com>
Date: Thu, 18 Dec 2014 17:41:01 +0100
Subject: postgresql-setup: use --username for pg_upgrade 9.4+

The --user option still works but we should be rather careful for
the future.  Master only.

References:
http://www.postgresql.org/docs/9.4/static/release-9-4.html

* configure.ac (AC_INIT): Bump to 3.0~dev version.
(PG_UPGRADE_BIN_USER_OPT): New variable carrying the right format
of pg_upgrade's username option.
* postgresql-setup.in (upgrade): Use @PG_UPGRADE_BIN_USER_OPT@.
---
 postgresql-setup.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'postgresql-setup.in')

diff --git a/postgresql-setup.in b/postgresql-setup.in
index 608b11d..17a14f0 100644
--- a/postgresql-setup.in
+++ b/postgresql-setup.in
@@ -228,7 +228,7 @@ upgrade()
                         '--new-datadir=$pgdata' \
                         --link \
                         '--old-port=$PGPORT' '--new-port=$PGPORT' \
-                        --user=postgres \
+                        @PG_UPGRADE_BIN_USER_OPT@=postgres \
                         $PGSETUP_PGUPGRADE_OPTIONS" \
                                 >> "$upgrade_log" 2>&1 < /dev/null
         if [ $? -ne 0 ]; then
-- 
cgit