From: Andrew Schoen <aschoen@redhat.com>
Date: Tue, 17 Nov 2015 17:13:46 +0000 (-0600)
Subject: ceph-deploy: remove get_rpm_dist as it exists in build_utils.sh
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=d9ac6a1e4b8765cf3fb0ed7fe4ad4898f29d58eb;p=ceph-build.git

ceph-deploy: remove get_rpm_dist as it exists in build_utils.sh

Signed-off-by: Andrew Schoen <aschoen@redhat.com>
---

diff --git a/ceph-deploy/build/build b/ceph-deploy/build/build
index 94d89295..a2e8880f 100644
--- a/ceph-deploy/build/build
+++ b/ceph-deploy/build/build
@@ -34,45 +34,7 @@ then
         # Tag tree and update version number in change log and
         # in setup.py before building.
 
-        get_rpm_dist() {
-            LSB_RELEASE=/usr/bin/lsb_release
-            [ ! -x $LSB_RELEASE ] && echo unknown && exit
-
-            ID=`$LSB_RELEASE --short --id`
-
-            case $ID in
-            RedHatEnterpriseServer)
-                DISTRO_VERSION=`$LSB_RELEASE --short --release | cut -d. -f1`
-                DISTRO=rhel
-                ;;
-            CentOS)
-                DISTRO_VERSION=`$LSB_RELEASE --short --release | cut -d. -f1`
-                DISTRO=centos
-                ;;
-            Fedora)
-                DISTRO_VERSION=`$LSB_RELEASE --short --release`
-                DISTRO=fedora
-                ;;
-            SUSE\ LINUX)
-                DESC=`$LSB_RELEASE --short --description`
-                DISTRO_VERSION=`$LSB_RELEASE --short --release`
-                case $DESC in
-                *openSUSE*)
-                        DISTRO=opensuse
-                    ;;
-                *Enterprise*)
-                        DISTRO=sles
-                        ;;
-                    esac
-                ;;
-            *)
-                DIST=unknown
-                DISTRO=unknown
-                ;;
-            esac
-
-        }
-
+        # this exists in scripts/build_utils.sh
         get_rpm_dist
 
         REPO=rpm-repo