Date: Thu, 20 Oct 2011 04:48:44 -0700 From: David Wolfskill <david@catwhisker.org> To: current@freebsd.org Subject: sys/conf/newvers.sh vs. subversion-1.7 Message-ID: <20111020114844.GK59810@albert.catwhisker.org>
next in thread | raw e-mail | index | archive | help
--yiup30KVCQiHUZFC
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable
I got to wondering why the "uname -a" output from my head slice no
longer showed the SVN GRN after I had updated to subversion-1.7.0.1.
First thing I checked was that "svnversion" existed & worked; check.
Then I noticed the logic iin newvers.sh:
=2E..
for dir in /bin /usr/bin /usr/local/bin; do
if [ -d "${SYSDIR}/.svn" -a -x "${dir}/svnversion" ] ; then
svnversion=3D${dir}/svnversion
break
if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then
git_cmd=3D"${dir}/git --git-dir=3D${SYSDIR}/../.git"
break
fi
done
=2E..
Well, as of subversion-1.7, we don't have a ".svn" directory in
${SYSDIR} any more -- it's only at the root of the working copy
(/usr/src, in this case). So "svnversion" is never invoked.
So I've just hacked my copy to parallel the "git" stanza & look for
${SYSDIR}/../.svn, Not sure that's ideal, but there appears to be
precedent.... :-}
It might be handy to resolve this prior to 9.0-RELEASE, I think.
Peace,
david
--=20
David H. Wolfskill david@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.
--yiup30KVCQiHUZFC
Content-Type: application/pgp-signature
Content-Disposition: inline
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v2.0.18 (FreeBSD)
iEYEARECAAYFAk6gCpsACgkQmprOCmdXAD35jwCeNEpvPqRPFGYHCG5SwW2dmhrE
9oEAn2CfXfAx/DW+gAxVZMZ+ccpGwuwx
=giK2
-----END PGP SIGNATURE-----
--yiup30KVCQiHUZFC--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?20111020114844.GK59810>