[svn-commits] sruffell: linux/trunk r9418 - /linux/trunk/build_tools/make_version

[SVN commits to the Digium repositories]

Author: sruffell
Date: Wed Sep 29 16:21:45 2010
New Revision: 9418

URL: http://svnview.digium.com/svn/dahdi?view=rev&rev=9418
Log:
make_version: svn and git metadata directory not checked properly.

(closes issue #16143)
Reported by: Max Khon

Signed-off-by: Kinsey Moore <kmoore at digium.com>
Signed-off-by: Shaun Ruffell <sruffell at digium.com>

Modified:
    linux/trunk/build_tools/make_version

Modified: linux/trunk/build_tools/make_version
URL: http://svnview.digium.com/svn/dahdi/linux/trunk/build_tools/make_version?view=diff&rev=9418&r1=9417&r2=9418
==============================================================================
--- linux/trunk/build_tools/make_version (original)
+++ linux/trunk/build_tools/make_version Wed Sep 29 16:21:45 2010
@@ -4,7 +4,7 @@
 	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 @@
     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=""