diff options
| author | Pavel Raiskup <praiskup@redhat.com> | 2016-01-06 23:56:33 +0100 |
|---|---|---|
| committer | Pavel Raiskup <praiskup@redhat.com> | 2016-01-07 00:05:44 +0100 |
| commit | 5f3f85486584a47fef8f38d442d33eb9791c79b2 (patch) | |
| tree | 6ed703fb47eaa79079d1b25c250bb3a74aa15df9 | |
| parent | 47fe731d3ed9b4a0fd60ffc4e79c294251763b1a (diff) | |
| download | postgresql-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.
| -rw-r--r-- | NEWS | 7 | ||||
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | postgresql-setup.in | 4 | ||||
| -rw-r--r-- | share/postgresql-setup/library.sh.in | 2 |
4 files changed, 11 insertions, 4 deletions
@@ -1,5 +1,12 @@ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +New in 4.0 version: + +* The postgresql-upgrade package is now optional packaging feature, for the + postgresql-setup --upgrade scenario it might/might not be needed. + +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + Bugfixes in 3.5 version * Fix spelling in error message regarding data-dir mountpoint. diff --git a/configure.ac b/configure.ac index 6125893..655eb6e 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # Use the MAJ.MIN[~SUFF]. Note that X.X > X.X~SUFF! -AC_INIT([postgresql-setup], [3.5], [praiskup@redhat.com]) +AC_INIT([postgresql-setup], [4.0], [praiskup@redhat.com]) AC_CONFIG_AUX_DIR(auxdir) config_aux_dir=auxdir AC_SUBST([config_aux_dir]) 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 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" |