From d19ce69f32c5fd941e39037a5238f75e2a294393 Mon Sep 17 00:00:00 2001
From: cuibb1 <95227821@qq.com>
Date: Fri, 19 Jun 2020 15:13:40 +0800
Subject: [PATCH] fix issue

---
 postgresql-setup | 12 ------------
 postgresql.spec  |  6 +++++-
 2 files changed, 5 insertions(+), 13 deletions(-)

diff --git a/postgresql-setup b/postgresql-setup
index 21c961e..bbb7c73 100755
--- a/postgresql-setup
+++ b/postgresql-setup
@@ -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"
diff --git a/postgresql.spec b/postgresql.spec
index 3bfe57f..3aa69de 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -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
-- 
Gitee