Merged revision 7510 via svnmerge from
authorKevin P. Fleming <kpfleming@digium.com>
Sat, 17 Dec 2005 02:22:24 +0000 (02:22 +0000)
committerKevin P. Fleming <kpfleming@digium.com>
Sat, 17 Dec 2005 02:22:24 +0000 (02:22 +0000)
https://origsvn.digium.com/svn/asterisk/branches/1.2

........
r7510 | kpfleming | 2005-12-16 20:20:04 -0600 (Fri, 16 Dec 2005) | 2 lines

fix some buglet when building team branch version strings

........

git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@7512 65c4cc65-6c06-0410-ace0-fbb531ad65f3

build_tools/make_svn_branch_name

index b3af149..d77bc3f 100755 (executable)
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :'`
+PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asterisk/:: | sed -e 's:/: :g'`
 BRANCH=0
 TEAM=0
 
@@ -47,4 +47,4 @@ do
   fi
 done
 
-echo ${RESULT}-r${REV}
+echo ${RESULT##-}-r${REV}