diff options
author | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-04 18:12:52 +0000 |
---|---|---|
committer | kpfleming <kpfleming@f38db490-d61c-443f-a65b-d21fe96a405b> | 2005-12-04 18:12:52 +0000 |
commit | dc76ba74df2442efe2e986ee50e13247a263ed81 (patch) | |
tree | d95357a9f252222bdd4d6363e1456765b0ef46fc /build_tools | |
parent | f83be6024292b703d2d698b176213c7c211d2a63 (diff) |
Merged revisions 7285,7299,7310,7329 via svnmerge from
https://origsvn.digium.com/svn/asterisk/branches/1.2
........
r7285 | tilghman | 2005-12-02 15:12:05 -0600 (Fri, 02 Dec 2005) | 2 lines
Turn on executable bits for startup scripts, and fix bash var interpolation for Mandrake
........
r7299 | oej | 2005-12-02 19:24:40 -0600 (Fri, 02 Dec 2005) | 2 lines
Documenting the default registerattempts setting as 0, continue hammering the server for ever and ever ;-)
........
r7310 | tilghman | 2005-12-03 13:55:05 -0600 (Sat, 03 Dec 2005) | 3 lines
Bug 5925: check for "Unknown", as that's what app_voicemail puts into the field for Unknown callerid
Also, remove useless res checks (initialized to 0; never set)
........
r7329 | kpfleming | 2005-12-04 12:03:07 -0600 (Sun, 04 Dec 2005) | 2 lines
use a more efficient way to get the revision number, that will also report if the working copy contains uncommitted modifications
........
git-svn-id: http://svn.digium.com/svn/asterisk/trunk@7330 f38db490-d61c-443f-a65b-d21fe96a405b
Diffstat (limited to 'build_tools')
-rwxr-xr-x | build_tools/make_svn_branch_name | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/build_tools/make_svn_branch_name b/build_tools/make_svn_branch_name index 484bef585..b3af1492a 100755 --- a/build_tools/make_svn_branch_name +++ b/build_tools/make_svn_branch_name @@ -4,7 +4,7 @@ PARTS=`LANG=C svn info | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/asteris BRANCH=0 TEAM=0 -REV=`LANG=C svn info | grep -e 'Last Changed Rev' | awk '{print $4;}'` +REV=`svnversion -c . | cut -d: -f2` if [ "${PARTS}" = "trunk" ] then |