svn commit: r234209 - in stable/9/sys: conf i386/conf kern
Andriy Gapon
avg at FreeBSD.org
Fri Apr 13 07:39:21 UTC 2012
Author: avg
Date: Fri Apr 13 07:39:20 2012
New Revision: 234209
URL: http://svn.freebsd.org/changeset/base/234209
Log:
MFC r231558: newvers.sh: unbreak git/git-svn support
Modified:
stable/9/sys/conf/newvers.sh
Directory Properties:
stable/9/sys/ (props changed)
stable/9/sys/amd64/include/xen/ (props changed)
stable/9/sys/boot/ (props changed)
stable/9/sys/boot/i386/efi/ (props changed)
stable/9/sys/boot/ia64/efi/ (props changed)
stable/9/sys/boot/ia64/ski/ (props changed)
stable/9/sys/boot/powerpc/boot1.chrp/ (props changed)
stable/9/sys/boot/powerpc/ofw/ (props changed)
stable/9/sys/cddl/contrib/opensolaris/ (props changed)
stable/9/sys/conf/ (props changed)
stable/9/sys/contrib/dev/acpica/ (props changed)
stable/9/sys/contrib/octeon-sdk/ (props changed)
stable/9/sys/contrib/pf/ (props changed)
stable/9/sys/contrib/x86emu/ (props changed)
stable/9/sys/fs/ (props changed)
stable/9/sys/fs/ntfs/ (props changed)
stable/9/sys/i386/conf/XENHVM (props changed)
stable/9/sys/kern/subr_witness.c (props changed)
Modified: stable/9/sys/conf/newvers.sh
==============================================================================
--- stable/9/sys/conf/newvers.sh Fri Apr 13 07:18:19 2012 (r234208)
+++ stable/9/sys/conf/newvers.sh Fri Apr 13 07:39:20 2012 (r234209)
@@ -92,11 +92,15 @@ for dir in /bin /usr/bin /usr/local/bin;
svnversion=${dir}/svnversion
break
fi
- if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
- git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
- break
- fi
done
+if [ -d "${SYSDIR}/../.git" ] ; then
+ for dir in /bin /usr/bin /usr/local/bin; do
+ if [ -x "${dir}/git" ] ; then
+ git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git"
+ break
+ fi
+ done
+fi
if [ -n "$svnversion" ] ; then
echo "$svnversion"
More information about the svn-src-stable-9
mailing list