There's still one problem left ... the svnliteversion test fails
because you are not in the correct directory. This is the patch that
worked for me ...
root@olive:/usr/src # svnlite diff sys/conf/newvers.sh
Index: sys/conf/newvers.sh
===================================================================
--- sys/conf/newvers.sh (revision 254187)
+++ sys/conf/newvers.sh (working copy)
@@ -105,7 +105,7 @@
done
if [ -z "${svnversion}" ] && [ -x /usr/bin/svnliteversion ] ; then
- /usr/bin/svnliteversion $(basename ${0}) >/dev/null 2>&1
+ cd ${SYSDIR}/conf && /usr/bin/svnliteversion $(basename ${0}) >/dev/null
2>&1
if [ $? -eq 0 ]; then
svnversion=/usr/bin/svnliteversion
else
On Sat, 10 Aug 2013, Glen Barber wrote:
On Sat, Aug 10, 2013 at 02:11:52PM -0400, Glen Barber wrote:
On Sat, Aug 10, 2013 at 01:09:20PM -0500, Dan Mack wrote:
It looks like you are doing the first [! -z '"${svnversion}"' ]
before $svnversion is being set. In the old version, this was
being set via:
if [ -x /usr/bin/svnliteversion ] ; then
svnversion=/usr/bin/svnliteversion
fi
But I'm not sure if that's intentional or not ...
Ugh. No, this was not intentional. I'll have this fixed shortly.
Fixed in r254184. The problem is that I was evaluating ${svnversion}
being set before looking for /usr/bin/svnliteversion; however when
_running_ /usr/bin/svnliteversion, it was being run as
/usr/bin/svnversion by mistake.
Thank you for the reports, and Dan, thank you for your help.
Glen
dan
--
Dan Mack
_______________________________________________
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"
