Date: Fri, 13 Apr 2012 12:49:16 +0200 From: Oliver Pinter <oliver.pntr@gmail.com> To: Andriy Gapon <avg@freebsd.org> Cc: svn-src-stable@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org, svn-src-stable-9@freebsd.org Subject: Re: svn commit: r234209 - in stable/9/sys: conf i386/conf kern Message-ID: <CAPjTQNFxw5uX4ivfCH0Da%2BzHpWXskV=1tDTv63pF0v8yuO__MA@mail.gmail.com> In-Reply-To: <201204130739.q3D7dKFQ066260@svn.freebsd.org> References: <201204130739.q3D7dKFQ066260@svn.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
Hi! Please MFC back this patch to 7 and 8 STABLE. On 4/13/12, Andriy Gapon <avg@freebsd.org> wrote: > 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" > _______________________________________________ > svn-src-stable@freebsd.org mailing list > http://lists.freebsd.org/mailman/listinfo/svn-src-stable > To unsubscribe, send any mail to "svn-src-stable-unsubscribe@freebsd.org" >
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAPjTQNFxw5uX4ivfCH0Da%2BzHpWXskV=1tDTv63pF0v8yuO__MA>