diff options
| author | Shaun Ruffell <sruffell@digium.com> | 2011-02-11 17:52:04 +0000 |
|---|---|---|
| committer | Shaun Ruffell <sruffell@digium.com> | 2011-02-11 17:52:04 +0000 |
| commit | e54893b9461b4777dcf3dcd6f0bc74ca43c8c850 (patch) | |
| tree | cbdaa3781e4dc9dce51a4889c09769626324fab1 | |
| parent | 8d242eecba524b5b099fc907bbecfdc7ef3e172f (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>
Origin: http://svnview.digium.com/svn/dahdi?view=rev&rev=9418
git-svn-id: http://svn.asterisk.org/svn/dahdi/linux/branches/2.4@9759 a0bf4364-ded3-4de4-8d8a-66a801d63aff
| -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="" |