From 5f3f85486584a47fef8f38d442d33eb9791c79b2 Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Wed, 6 Jan 2016 23:56:33 +0100 Subject: 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. --- share/postgresql-setup/library.sh.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'share/postgresql-setup') 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" -- cgit