Date: Tue, 25 Oct 2011 12:43:47 -0700 From: Craig Rodrigues <rodrigc@crodrigues.org> To: David Wolfskill <david@catwhisker.org> Cc: freebsd-current@freebsd.org Subject: Re: sys/conf/newvers.sh vs. subversion-1.7 Message-ID: <CAG=rPVdS%2BPOJqATw7kmb0%2Bb9byp3r2Vp8o=ELRFj9K7rA1zpYA@mail.gmail.com> In-Reply-To: <20111025140000.GA8559@albert.catwhisker.org> References: <20111020114844.GK59810@albert.catwhisker.org> <20111020122121.GL59810@albert.catwhisker.org> <201110211636.05917.jhb@freebsd.org> <20111025140000.GA8559@albert.catwhisker.org>
next in thread | previous in thread | raw e-mail | index | archive | help
On Tue, Oct 25, 2011 at 7:00 AM, David Wolfskill <david@catwhisker.org> wro=
te:
> Index: sys/conf/newvers.sh
> =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
> --- sys/conf/newvers.sh (revision 226724)
> +++ sys/conf/newvers.sh (working copy)
> @@ -88,7 +88,7 @@
> =A0i=3D`${MAKE:-make} -V KERN_IDENT`
>
> =A0for dir in /bin /usr/bin /usr/local/bin; do
> - =A0 =A0 =A0 if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
> + =A0 =A0 =A0 if [ ( -d "${SYSDIR}/.svn" -o -d "${SYSDIR}/../.svn" ) -a -=
x "${dir}/svnversion" ] ; then
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0svnversion=3D${dir}/svnversion
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0break
> =A0 =A0 =A0 =A0fi
>
> then? =A0That should preserve current behavior for the case you & Jilles
> expressed concern about, while repairing the currently-broken default
> case.
>
> I believe it's in the interest of the project to have that default
> case working again (at least) in time for 9.0-RELEASE.
>
> Please.
>
>> ....
>
> I'm staying out of the "svnversion vs. svn info" branch of the thread.
>
> Peace,
> david
> --
> David H. Wolfskill =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0david@catwhisker.org
> Depriving a girl or boy of an opportunity for education is evil.
>
> See http://www.catwhisker.org/~david/publickey.gpg for my public key.
Hi,
I know that Doug disagreed with me on this, but I think this would be
easier to implement in the short term:
for dir in /bin /usr/bin /usr/local/bin; do
if [ -x "${dir}/svnversion" -a -x "${dir}/svn" ]; then
${dir}/svn info ${SRCDIR}/sys > /dev/null 2>&1
if [ $? -eq 0 ]; then
svnversion=3D${dir}/svnversion
fi
fi
done
The alternative would be to run ${dir}/svnversion, and check the output
of that command, making sure that the output starts with a number.
--=20
Craig Rodrigues
rodrigc@crodrigues.org
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAG=rPVdS%2BPOJqATw7kmb0%2Bb9byp3r2Vp8o=ELRFj9K7rA1zpYA>