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

---
 postgresql-setup | 12 ------------
 postgresql.spec  |  5 +++--
 2 files changed, 3 insertions(+), 14 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 87674f5..3aa69de 100644
--- a/postgresql.spec
+++ b/postgresql.spec
@@ -430,8 +430,9 @@ find_lang_bins pltcl.lst pltcl
 %attr(-,postgres,postgres) %{_libdir}/pgsql/test
 
 %changelog
-* Mon May 18 2020 wangchen <wangchen137@huawei.com> - 10.5-16
-- rebuild for postgresql
+* 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
-- 
Gitee