fix issue

This commit is contained in:
cuibb1 2020-06-19 15:13:40 +08:00
parent 598590a147
commit d19ce69f32
2 changed files with 5 additions and 13 deletions

View File

@ -635,11 +635,6 @@ while true; do
shift 2
;;
--upgrade-ids)
parse_upgrade_setup help
exit 0
;;
--version)
print_version
exit 0
@ -662,13 +657,6 @@ test $parse_fail -ne 0 && die "can't parse arguments"
test "$option_mode" = none \
&& die "no mode specified, use --initdb or --upgrade, or --help"
if ! parse_upgrade_setup config "$option_upgradefrom"; then
if test upgrade = "$option_mode"; then
die $"bad --upgrade-from parameter '$option_upgradefrom'," \
$"try --upgrade-ids"
fi
fi
## GATHER THE SETUP FIRST ##
initdb_log="$POSTGRES_HOMEDIR/initdb_${option_service}.log"

View File

@ -4,7 +4,7 @@
Name: postgresql
Version: 10.5
Release: 15
Release: 16
Summary: PostgreSQL client programs
License: PostgreSQL
URL: http://www.postgresql.org/
@ -430,6 +430,10 @@ find_lang_bins pltcl.lst pltcl
%attr(-,postgres,postgres) %{_libdir}/pgsql/test
%changelog
* Fri Jun 19 2020 cuibaobao <cuibaobao1@huawei.com> - 10.5-16
- Type: enhancement
- DESC: delete all about residual parse_upgrade_setup in postgresql-setup
* Wed May 6 2020 cuibaobao <cuibaobao1@huawei.com> - 10.5-15
- Type:cve
- ID:CVE-2020-1720