Oliver Pinter
2012-Jan-06 18:22 UTC
[RFC] fix git detection code in newvers.sh when svn installed
Hi All! When svn installed and the source stored in git, then now the version detection failed. The attached patch fixed this situation. -- Oliver Pinter (Tresorium) -------------- next part -------------- A non-text attachment was scrubbed... Name: 20120103121800-fix-newvers-sh-git.diff Type: text/x-diff Size: 678 bytes Desc: not available Url : http://lists.freebsd.org/pipermail/freebsd-stable/attachments/20120106/07e193e5/20120103121800-fix-newvers-sh-git.bin
Sergey Kandaurov
2012-Jan-06 18:59 UTC
[RFC] fix git detection code in newvers.sh when svn installed
On 6 January 2012 21:50, Oliver Pinter <pinter@tresorium.hu> wrote:> Hi All! > > When svn installed and the source stored in git, then now the version > detection failed. The attached patch fixed this situation. >FWIW, a different version proposed by Maciej Milewski on -current some time ago. I don't have/use git, so I cannot test these changes. It is good in the sense that it doesn't duplicate a search path. The patch is below for reference: --- sys/conf/newvers.sh 2011-11-19 00:56:50.795815738 +0100 +++ sys/conf/newvers-patched.sh 2011-11-19 00:58:21.187818982 +0100 @@ -88,14 +88,14 @@ i=`${MAKE:-make} -V KERN_IDENT` for dir in /bin /usr/bin /usr/local/bin; do - if [ -x "${dir}/svnversion" ] ; then - svnversion=${dir}/svnversion - break - fi if [ -d "${SYSDIR}/../.git" -a -x "${dir}/git" ] ; then git_cmd="${dir}/git --git-dir=${SYSDIR}/../.git" break fi + if [ -x "${dir}/svnversion" ] ; then + svnversion=${dir}/svnversion + break + fi done if [ -n "$svnversion" ] ; then -- wbr, pluknet