From: Sage Weil <sage@redhat.com>
Date: Mon, 1 Jun 2015 18:19:46 +0000 (-0700)
Subject: make_dist.sh: improve version calc
X-Git-Tag: v9.0.2~60^2~1
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=44f8bbb512a5e923d9877ff8193bc0dee345a3ed;p=ceph.git

make_dist.sh: improve version calc

Signed-off-by: Sage Weil <sage@redhat.com>
---

diff --git a/make_dist.sh b/make_dist.sh
index 1724e6b407be..731ed1c499db 100755
--- a/make_dist.sh
+++ b/make_dist.sh
@@ -6,9 +6,11 @@ if [ ! -d .git ]; then
 fi
 
 version=$1
-[ -z "$version" ] && version=`git describe | cut -c 2-`
+[ -z "$version" ] && version=`git describe --match 'v*' | sed 's/^v//'`
 outfile="ceph-$version"
 
+echo "version $version"
+
 # update submodules
 echo "updating submodules..."
 force=$(if git submodule usage 2>&1 | grep --quiet 'update.*--force'; then echo --force ; fi)