svn commit: samba r23670 - in branches: SAMBA_3_0/source/script SAMBA_3_0_26/source/script

vlendec at samba.org vlendec at samba.org
Sun Jul 1 19:11:41 GMT 2007


Author: vlendec
Date: 2007-07-01 19:11:40 +0000 (Sun, 01 Jul 2007)
New Revision: 23670

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=23670

Log:
Fix mkversion.sh for the git case: Only use the first line where
"commit" occurs

Modified:
   branches/SAMBA_3_0/source/script/mkversion.sh
   branches/SAMBA_3_0_26/source/script/mkversion.sh


Changeset:
Modified: branches/SAMBA_3_0/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_3_0/source/script/mkversion.sh	2007-07-01 00:09:20 UTC (rev 23669)
+++ branches/SAMBA_3_0/source/script/mkversion.sh	2007-07-01 19:11:40 UTC (rev 23670)
@@ -107,7 +107,7 @@
     if test x"${HAVEVER}" != x"yes";then
 	HAVEGIT=no
         GIT_INFO=`git show --abbrev-commit HEAD 2>/dev/null`
-	TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
+	TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' | sed 1q |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
 	if test -n "$TMP_REVISION";then
 	    HAVEGIT=yes
             HAVEVER=yes

Modified: branches/SAMBA_3_0_26/source/script/mkversion.sh
===================================================================
--- branches/SAMBA_3_0_26/source/script/mkversion.sh	2007-07-01 00:09:20 UTC (rev 23669)
+++ branches/SAMBA_3_0_26/source/script/mkversion.sh	2007-07-01 19:11:40 UTC (rev 23670)
@@ -107,7 +107,7 @@
     if test x"${HAVEVER}" != x"yes";then
 	HAVEGIT=no
         GIT_INFO=`git show --abbrev-commit HEAD 2>/dev/null`
-	TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
+	TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' | sed 1q |sed -e 's/commit \([0-9a-f]*\).*/\1/'`
 	if test -n "$TMP_REVISION";then
 	    HAVEGIT=yes
             HAVEVER=yes



More information about the samba-cvs mailing list