diff options
author | Kinsey Moore <kmoore@digium.com> | 2010-09-29 21:21:45 +0000 |
---|---|---|
committer | Shaun Ruffell <sruffell@digium.com> | 2010-09-29 21:21:45 +0000 |
commit | fb0f845c8ebd95ada4fceb90946a7c4af5df61c9 (patch) | |
tree | e0b4822d85fb2d37b371f8059c70179d3e55617f /build_tools | |
parent | 503d8570bcf7554ae9fd3c6844cdf9a9c9df0307 (diff) |
make_version: svn and git metadata directory not checked properly.
(closes issue #16143)
Reported by: Max Khon
Signed-off-by: Kinsey Moore <kmoore@digium.com>
Signed-off-by: Shaun Ruffell <sruffell@digium.com>
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/trunk@9418 a0bf4364-ded3-4de4-8d8a-66a801d63aff
Diffstat (limited to 'build_tools')
-rwxr-xr-x | build_tools/make_version | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/build_tools/make_version b/build_tools/make_version index e61580f..488fc8c 100755 --- a/build_tools/make_version +++ b/build_tools/make_version @@ -4,7 +4,7 @@ if [ -f ${1}/.version ]; then cat ${1}.version elif [ -f ${1}/.svnrevision ]; then echo SVN-`cat ${1}/.svnbranch`-r`cat ${1}/.svnrevision` -elif [ -d .svn ]; then +elif [ -d ${1}/.svn ]; then PARTS=`LANG=C svn info ${1} | grep URL | awk '{print $2;}' | sed -e s:^.*/svn/${2}/:: | sed -e 's:/: :g'` BRANCH=0 TEAM=0 @@ -53,7 +53,7 @@ elif [ -d .svn ]; then done echo SVN-${RESULT##-}-r${REV} -elif [ -d .git ]; then +elif [ -d ${1}/.git ]; then # If the first log commit messages indicates that this is checked into # subversion, we'll just use the SVN- form of the revision. MODIFIED="" |