automerge commit

git-svn-id: http://svn.digium.com/svn/asterisk/branches/1.2-netsec@55913 f38db490-d61c-443f-a65b-d21fe96a405b

1 files changed, 14 insertions, 3 deletions

diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name
index 848ca49eb..f934ee468 100755
--- a/build_tools/make_svn_branch_name
+++ b/build_tools/make_svn_branch_name
@@ -3,6 +3,7 @@
 PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e 's:^.*/svn/asterisk/::' | sed -e 's:/: :g'`
 BRANCH=0
 TEAM=0
+TAG=0
 
 REV=`svnversion -c . | cut -d: -f2`
 
@@ -14,6 +15,12 @@ fi
 
 for PART in $PARTS
 do
+  if [ ${TAG} != 0 ]
+  then
+      RESULT="${PART}"
+      break
+  fi
+
   if [ ${BRANCH} != 0 ]
   then
       RESULT="${RESULT}-${PART}"
@@ -35,8 +42,7 @@ do
 
   if [ "${PART}" = "tags" ]
   then
-      BRANCH=1
-      RESULT="tag"
+      TAG=1
       continue
   fi
 
@@ -47,4 +53,9 @@ do
   fi
 done
 
-echo ${RESULT##-}-r${REV}
+if [ ${TAG} != 0 ]
+then
+    echo ${RESULT}
+else
+    echo ${RESULT##-}-r${REV}
+fi