r6920: display the SVN revision in svk build of tree's directly mirrored from samba.org

metze
(This used to be commit 7feddfb5d28784ff4f7dd13075c53923d4df6330)

diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index 6f49108aba0f03c8af6e120d7f00216620eb07c6..d9d84a5337b52d7ba9080648d1517c090467fde7 100755 (executable)
--- a/source4/script/mkversion.sh
+++ b/source4/script/mkversion.sh
@@ -54,7 +54,12 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
     if test x"${HAVESVN}" = x"no";then
        HAVESVK=no
        svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes
     if test x"${HAVESVN}" = x"no";then
        HAVESVK=no
        svk info ${SOURCE_DIR} >/dev/null 2>&1 && HAVESVK=yes

-       TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
+       TMP_MIRRORED_REVISION=`(svk info ${SOURCE_DIR} 2>/dev/null) |grep 'Mirrored From:.*samba\.org.*' |sed -e 's/Mirrored From: .* Rev\..* \([0-9]*\).*/\1/'`
+       if test -n "$TMP_MIRRORED_REVISION"; then
+           TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}-[SVN-${TMP_MIRRORED_REVISION}]"
+       else
+           TMP_SVK_REVISION_STR="${TMP_REVISION}-${USER}@${HOSTNAME}"
+       fi

     fi
 
     if test x"${HAVESVN}" = x"yes";then
     fi
 
     if test x"${HAVESVN}" = x"yes";then