From: Sage Weil <sage@newdream.net>
Date: Mon, 28 Feb 2011 22:41:02 +0000 (-0800)
Subject: fix release_tarball.sh version calculation
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=f2bbd60b758d0ba7c807a0d8dbb487fa8b2e94b7;p=ceph-build.git

fix release_tarball.sh version calculation
---

diff --git a/release_tarball.sh b/release_tarball.sh
index 9d1662c38..1ffaa72f6 100755
--- a/release_tarball.sh
+++ b/release_tarball.sh
@@ -20,8 +20,6 @@ else
     echo "forcing."
 fi
 
-vers=`git describe --abbrev=0 | cut -c 2-`
-echo last version $vers
 cephver=`git describe | cut -c 2-`
 echo current version $cephver
 
@@ -31,14 +29,19 @@ if [ -d "$releasedir/$cephver" ]; then
     echo "$releasedir/$cephver already exists; reuse that release tarball"
 else
     echo building tarball
+    rm ceph-*.tar.gz || true
     make dist
 
+    vers=`ls ceph-*.tar.gz | cut -c 6- | sed 's/.tar.gz//'`
+    echo tarball vers $vers
+
     echo extracting
     mkdir -p $releasedir/$cephver
     cd $releasedir/$cephver
 
     tar zxf $srcdir/ceph-$vers.tar.gz 
     [ "$vers" != "$cephver" ] && mv ceph-$vers ceph-$cephver
+
     tar zcf ceph_$cephver.orig.tar.gz ceph-$cephver
     cp -a ceph_$cephver.orig.tar.gz ceph-$cephver.tar.gz