Upgrade fails from 18.1.3 to 19.1.1 with postgresql error on Open SUSE

openpbs · Jan 21, 2019 · 3009492 · 3009492
1 parent 54f497e
commit 3009492
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/src/cmds/scripts/pbs_habitat.in b/src/cmds/scripts/pbs_habitat.in
@@ -221,8 +221,10 @@ upgrade_pbs_database() {
 		return 1
 	fi
 
-	sys_pgsql_ver=$(echo `${PGSQL_DIR}/bin/psql -V` | awk 'NR==1 {print $NF}' | cut -d '.' -f 1,2)
+	sys_pgsql_ver=$(echo `${PGSQL_BIN}/postgres -V` | awk 'NR==1 {print $NF}' | cut -d '.' -f 1,2)
 	old_pgsql_ver=`cat ${data_dir}/PG_VERSION`
+	# strip the minor version from sys_pgsql_ver if old_pgsql_ver does not have minor version (for comparison).
+	[[ ! $old_pgsql_ver =~ "." ]] && sys_pgsql_ver=$(echo $sys_pgsql_ver | cut -d '.' -f 1)
 
 	[ ${sys_pgsql_ver%.*} -eq ${old_pgsql_ver%.*} ] && [ ${sys_pgsql_ver#*.} \> ${old_pgsql_ver#*.} ] || [ ${sys_pgsql_ver%.*} -gt ${old_pgsql_ver%.*} ];
 	result=$?