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. --- postgresql-setup.in | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'postgresql-setup.in') diff --git a/postgresql-setup.in b/postgresql-setup.in index 90c222d..ba9def2 100644 --- a/postgresql-setup.in +++ b/postgresql-setup.in @@ -206,8 +206,8 @@ upgrade() error_q $"version $old_data_version but it should be $upgradefrom_major" exit 1 fi - if [ ! -x "$PGENGINE/pg_upgrade" ]; then - error $"Please install the @NAME_PACKAGE@-upgrade package." + if [ ! -x "$upgradefrom_engine/postgres" ]; then + error $"Please install the $upgradefrom_package package." exit 5 fi -- cgit