summaryrefslogtreecommitdiffstats
path: root/share/postgresql-setup
diff options
context:
space:
mode:
authorPavel Raiskup <praiskup@redhat.com>2016-01-06 23:56:33 +0100
committerPavel Raiskup <praiskup@redhat.com>2016-01-07 00:05:44 +0100
commit5f3f85486584a47fef8f38d442d33eb9791c79b2 (patch)
tree6ed703fb47eaa79079d1b25c250bb3a74aa15df9 /share/postgresql-setup
parent47fe731d3ed9b4a0fd60ffc4e79c294251763b1a (diff)
downloadpostgresql-setup-5f3f85486584a47fef8f38d442d33eb9791c79b2.tar.gz
postgresql-setup-5f3f85486584a47fef8f38d442d33eb9791c79b2.tar.xz
postgresql-setup-5f3f85486584a47fef8f38d442d33eb9791c79b2.zip
postgresql-setup: reflect pg_upgrade movement
The pg_upgrade binary is not in postgresql-upgrade package now. In some upgrade scenarios, postgresql-upgrade is redundant package (SCLs/PGRPMSs). Hack the code so postgresql-setup is able to correctly advice which package should be installed to make the "old" engine available. * postgresql-setup.in (upgrade): Don't check for pg_upgrade binary existence but rather for postgres binary, and warn user with proper package name if missing. * share/postgresql-setup/library.sh.in (parse_upgrade_setup): White-list also 'package' constant name. * configure.ac: Bump version.
Diffstat (limited to 'share/postgresql-setup')
-rw-r--r--share/postgresql-setup/library.sh.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/share/postgresql-setup/library.sh.in b/share/postgresql-setup/library.sh.in
index cfbf213..9835029 100644
--- a/share/postgresql-setup/library.sh.in
+++ b/share/postgresql-setup/library.sh.in
@@ -71,7 +71,7 @@ parse_upgrade_setup()
test -d "$upgrade_confdir" || die "can't read confdir $upgrade_confdir"
local my_vars="id comment data_default engine description major scls \
- redhat_sockets_hack pghost_override"
+ redhat_sockets_hack pghost_override package"
while read conffile
do
read_config_file "$conffile" "$my_vars"