From 84d9cdb5112e55ae8a1e525ca2b8cef2ae606f22 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Tue, 28 Jun 2011 12:52:37 +0200
Subject: release-scripts/create-tarball: always create a tag in form of
 samba-${version}

metze
---
 release-scripts/create-tarball | 26 ++++++--------------------
 1 file changed, 6 insertions(+), 20 deletions(-)

(limited to 'release-scripts/create-tarball')

diff --git a/release-scripts/create-tarball b/release-scripts/create-tarball
index 213e35e36e..e6a515f48a 100755
--- a/release-scripts/create-tarball
+++ b/release-scripts/create-tarball
@@ -3,7 +3,6 @@
 ## option defaults
 OPT_BRANCH=""
 OPT_DOCSDIR=""
-OPT_TAG=""
 OPT_KEYID=""
 
 TOPDIR="`dirname $0`/.."
@@ -32,7 +31,6 @@ function printUsage
     echo "    --help             Print command usage"
     echo "    --branch <name>    Specify the branch to to create the archive file from"
     echo "    --copy-docs <dir>  Copy documentation from <dir> rather than building"
-    echo "    --tag <name>       Tag name for release"
     echo "    --keyid <email>    The GnuPG key ID used to sign the release tag"
     echo ""
 }
@@ -67,15 +65,6 @@ function parseOptions
 		OPT_DOCSDIR="$1"
 		shift
 		;;
-	    --tag)
-		shift
-		if [ -z "$1" ]; then
-		    printUsage
-		    return 1
-		fi
-		OPT_TAG="$1"
-		shift
-		;;
 	    --keyid)
 		shift
 		if [ -z "$1" ]; then
@@ -145,13 +134,10 @@ function buildDocs
 ##
 function createReleaseTag
 {
-    if [ -z "${OPT_TAG}" ]; then
-	echo "Tagging disabled"
-	return 0
-    fi
+    tagname="$1"
 
-    if [ "x`git tag -l ${OPT_TAG}`" != "x" ]; then
-	echo -n "Tag exists.  Do you wish to overwrite? (y/N): "
+    if [ "x`git tag -l ${tagname}`" != "x" ]; then
+	echo -n "Tag '${tagname}' exists.  Do you wish to overwrite? (y/N): "
 	read answer
 
 	if [ "x$answer" != "xy" ]; then
@@ -168,8 +154,8 @@ function createReleaseTag
 	fi
     fi
 
-    git tag -u ${OPT_KEYID} ${OPT_TAG}
-    exitOnError $? "Failed to create tag"
+    git tag -u ${OPT_KEYID} ${tagname}
+    exitOnError $? "Failed to create tag '${tagname}'"
 
     return 0
 }
@@ -239,7 +225,7 @@ function main
 
     popd
 
-    createReleaseTag
+    createReleaseTag "samba-${version}"
     exitOnError $? "Failed to create release tag"
 
     return 0
-- 
cgit