ceph-build/build/build_deb: set and use debian_version/bpvers earlier

Signed-off-by: Dan Mick <dan.mick@redhat.com>

diff --git a/ceph-build/build/build_deb b/ceph-build/build/build_deb
index f0adce50c23bab58e868e0bfdc712bac349b7b44..12c6c75c62943801eb9192f569bd5b1bffe50a8a 100644 (file)
--- a/ceph-build/build/build_deb
+++ b/ceph-build/build/build_deb
@@ -36,6 +36,7 @@ BPTAG=`get_bptag $DIST`
 [ "$TEST" = true ] && chacra_ref="test"
 vers=`cat ./dist/version`
 distro=`python -c "exec 'import platform; print platform.linux_distribution()[0].lower()'"`
+debian_version=${vers}-1
 chacra_endpoint="ceph/${chacra_ref}/${distro}/${DIST}/${ARCH}"
 gen_debian_version() {
     raw=$1
@@ -54,6 +55,8 @@ gen_debian_version() {
     echo $dver
 }
 
+bpvers=`gen_debian_version $debian_version $DIST`
+
 if [ "$THROWAWAY" = false ] ; then
     # this exists in scripts/build_utils.sh
     check_binary_existence $chacra_endpoint
@@ -74,7 +77,7 @@ echo "*****"
 mkdir -p release
 cp -a dist release/${vers}
 echo $DIST > release/${vers}/debian_dists
-echo "${vers}-1" > release/${vers}/debian_version
+echo "${debian_version}" > release/${vers}/debian_version
 
 cd release/$vers
 
@@ -132,15 +135,11 @@ echo version $cephver
 # it doesn't make sense to have a file that lives in /srv/ that we then
 # concatenate to get its contents.
 
-dvers=`cat $releasedir/$cephver/debian_version`
-echo deb vers $dvers
-
 
 # FIXME this looks exactly like `setup_pbuilder`, we probably don't need this
 # or we need to refactor.
 sudo pbuilder --clean
 
-bpvers=`gen_debian_version $dvers $DIST`
 echo deb vers $bpvers
 
 
@@ -165,7 +164,6 @@ else
 fi
 
 # do lintian checks
-bpvers=`gen_debian_version $dvers $DIST`
 echo lintian checks for $bpvers
 echo lintian --allow-root $releasedir/$cephver/*$bpvers*.deb