]> git.apps.os.sepia.ceph.com Git - ceph-build.git/commitdiff
scripts/build_utils: reuse get_bptag() in gen_debian_version()
authorKefu Chai <kchai@redhat.com>
Tue, 8 Dec 2020 05:45:47 +0000 (13:45 +0800)
committerKefu Chai <kchai@redhat.com>
Tue, 8 Dec 2020 05:45:50 +0000 (13:45 +0800)
less repeating this way

Signed-off-by: Kefu Chai <kchai@redhat.com>
scripts/build_utils.sh

index 2d905aaacee3a5441aa5dcda9eeda6a75bf3f6dc..b4f7b049ebf2f3e09e0dbc071c0930da603b94fa 100644 (file)
@@ -766,24 +766,12 @@ get_bptag() {
 }
 
 gen_debian_version() {
-    raw=$1
-    dist=$2
-
-    [ "$dist" = "sid" ] && dver="$raw"
-    [ "$dist" = "buster" ] && dver="$raw~bpo10+1"
-    [ "$dist" = "stretch" ] && dver="$raw~bpo90+1"
-    [ "$dist" = "jessie" ] && dver="$raw~bpo80+1"
-    [ "$dist" = "wheezy" ] && dver="$raw~bpo70+1"
-    [ "$dist" = "squeeze" ] && dver="$raw~bpo60+1"
-    [ "$dist" = "lenny" ] && dver="$raw~bpo50+1"
-    [ "$dist" = "precise" ] && dver="$raw$dist"
-    [ "$dist" = "saucy" ] && dver="$raw$dist"
-    [ "$dist" = "trusty" ] && dver="$raw$dist"
-    [ "$dist" = "xenial" ] && dver="$raw$dist"
-    [ "$dist" = "bionic" ] && dver="$raw$dist"
-    [ "$dist" = "focal" ] && dver="$raw$dist"
+    local raw=$1
+    local dist=$2
+    local bptag
 
-    echo $dver
+    bptag=$(get_bptag $dist)
+    echo "${raw}${bptag}"
 }
 
 build_debs() {