Merge branch 'PGPRO9_6_TASK941' of gitlab.postgrespro.ru:pgpro-dev/postgrespro into PGPRO9_6_TASK941

dmpgpro · dmpgpro · commit e799fea28135 · 2017-08-30T17:32:11.000+03:00
diff --git a/src/pgpro-upgrade/pgpro_upgrade b/src/pgpro-upgrade/pgpro_upgrade
@@ -32,6 +32,10 @@ CATALOG_VERSION_NO=2016081311
 MAJORVER=9.6
 CATVER=`${PGBIN}pg_controldata|sed -n '/Catalog version number:/s/^.*: *//p'`
 if [ "$CATVER" != $CATALOG_VERSION_NO ]; then
+    if [ -n "$check" ]; then
+        echo "Database needs upgrade"
+        exit 1
+    fi
 	if [ ! -f "${PGDATA}/global/pg_control" ]; then
 		# looks like we have Debian with separate directory for configs
 		SAVE_PGDATA="$PGDATA"
