On Tue, Oct 25, 2011 at 7:00 AM, David Wolfskill <da...@catwhisker.org> wrote:
> Index: sys/conf/newvers.sh
> ===================================================================
> --- sys/conf/newvers.sh (revision 226724)
> +++ sys/conf/newvers.sh (working copy)
> @@ -88,7 +88,7 @@
> i=`${MAKE:-make} -V KERN_IDENT`
>
> for dir in /bin /usr/bin /usr/local/bin; do
> - if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
> + if [ ( -d "${SYSDIR}/.svn" -o -d "${SYSDIR}/../.svn" ) -a -x
> "${dir}/svnversion" ] ; then
> svnversion=${dir}/svnversion
> break
> fi
>
> then? That 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 da...@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=${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.
--
Craig Rodrigues
rodr...@crodrigues.org
_______________________________________________
freebsd-current@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/freebsd-current
To unsubscribe, send any mail to "freebsd-current-unsubscr...@freebsd.org"
