From e41b5d47cae973dce7ee8366b710573f706e689a Mon Sep 17 00:00:00 2001 From: Pavel Raiskup Date: Thu, 3 Jul 2014 14:48:12 +0200 Subject: postgresql-setup: --upgrade std{out,err} adjusted Use the echo wrappers also in --upgrade. Previously, e.g. when PGDATA pointed to directory without SELinux label, the output from postgresql-setup --upgrade was broken by warnings from restorecon: # postgresql-setup --upgrade --service postgresql@SUFFIX Upgrading database: /sbin/restorecon: Warning no default label for /tmp/data /sbin/restorecon: Warning no default label for /tmp/data/pg_log OK --- postgresql-setup.in | 20 ++++++++------------ 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/postgresql-setup.in b/postgresql-setup.in index 7f7c6c9..076dafe 100644 --- a/postgresql-setup.in +++ b/postgresql-setup.in @@ -169,9 +169,7 @@ upgrade() exit 1 fi if [ ! -x "$PGENGINE/pg_upgrade" ]; then - echo - echo $"Please install the postgresql-upgrade RPM." - echo + error $"Please install the postgresql-upgrade package." exit 5 fi @@ -201,7 +199,7 @@ upgrade() echo "local all postgres ident" > "$pgdataold/pg_hba.conf" fi - echo -n $"Upgrading database: " + info $"Upgrading database." # Create empty new-format database if perform_initdb; then @@ -231,19 +229,17 @@ upgrade() fi if [ $script_result -eq 0 ]; then - echo $"OK" - echo - echo $"The configuration files were replaced by default configuration." - echo $"The previous configuration and data are stored in folder" - echo $pgdataold. + info $"Upgraded OK." + warn $"The configuration files were replaced by default configuration." + warn $"The previous configuration and data are stored in folder" + warn $pgdataold. else # Clean up after failure rm -rf "$pgdata" mv "$pgdataold" "$pgdata" - echo $"failed" + error $"failed" fi - echo - echo $"See $upgrade_log for details." + info $"See $upgrade_log for details." } -- cgit