From: Kefu Chai <kchai@redhat.com>
Date: Thu, 1 Oct 2020 10:33:02 +0000 (+0800)
Subject: scripts/build_utils: remove duplicated get_rpm_dist()
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=8e83d2dd1b4b5ee69ee3524bce512d9d52a9cc28;p=ceph-build.git

scripts/build_utils: remove duplicated get_rpm_dist()

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/scripts/build_utils.sh b/scripts/build_utils.sh
index be52ace98..463ce7695 100644
--- a/scripts/build_utils.sh
+++ b/scripts/build_utils.sh
@@ -239,25 +239,29 @@ get_rpm_dist() {
 
     case $ID in
     RedHatEnterpriseServer)
-        DISTRO_VERSION=`$LSB_RELEASE --short --release | cut -d. -f1`
+        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
+        DIST=rhel$RELEASE
         DISTRO=rhel
         ;;
     CentOS)
-        DISTRO_VERSION=`$LSB_RELEASE --short --release | cut -d. -f1`
+        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
+        DIST=el$RELEASE
         DISTRO=centos
         ;;
     Fedora)
-        DISTRO_VERSION=`$LSB_RELEASE --short --release`
+        RELEASE=`$LSB_RELEASE --short --release`
         DISTRO=fedora
         ;;
     SUSE\ LINUX|openSUSE)
         DESC=`$LSB_RELEASE --short --description`
-        DISTRO_VERSION=`$LSB_RELEASE --short --release`
+        RELEASE=`$LSB_RELEASE --short --release`
         case $DESC in
         *openSUSE*)
+                DIST=opensuse$RELEASE
                 DISTRO=opensuse
             ;;
         *Enterprise*)
+                DIST=sles$RELEASE
                 DISTRO=sles
                 ;;
             esac
@@ -267,7 +271,8 @@ get_rpm_dist() {
         DISTRO=unknown
         ;;
     esac
-
+    DISTRO_VERSION=$RELEASE
+    echo $DIST
 }
 
 check_binary_existence () {
@@ -1088,51 +1093,6 @@ maybe_reset_ci_container() {
     fi
 }
 
-get_rpm_dist() {
-    LSB_RELEASE=/usr/bin/lsb_release
-    [ ! -x $LSB_RELEASE ] && echo unknown && exit
-
-    ID=`$LSB_RELEASE --short --id`
-
-    case $ID in
-    RedHatEnterpriseServer)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
-        DIST=rhel$RELEASE
-        DISTRO=rhel
-        ;;
-    CentOS)
-        RELEASE=`$LSB_RELEASE --short --release | cut -d. -f1`
-        DIST=el$RELEASE
-        DISTRO=centos
-        ;;
-    Fedora)
-        RELEASE=`$LSB_RELEASE --short --release`
-        DIST=fc$RELEASE
-        DISTRO=fedora
-        ;;
-    SUSE\ LINUX)
-        DESC=`$LSB_RELEASE --short --description`
-        RELEASE=`$LSB_RELEASE --short --release`
-        case $DESC in
-        *openSUSE*)
-                DIST=opensuse$RELEASE
-                DISTRO=opensuse
-            ;;
-        *Enterprise*)
-                DIST=sles$RELEASE
-                DISTRO=sles
-                ;;
-            esac
-        ;;
-    *)
-        DIST=unknown
-        DISTRO=unknown
-        ;;
-    esac
-
-    echo $DIST
-}
-
 setup_rpm_build_deps() {
     $SUDO yum install -y yum-utils
     if [ "$RELEASE" = 7 ]; then