summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2005-05-20 13:49:14 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 13:16:56 -0500
commit928d74914318be9a223037f25d9c0394e39e4b7e (patch)
treeb6f6dcf96a104c9263ac0ef88113e49f6de085bf
parentdf1bac4442a9ff2a2ff73aa12d143b2a867a6461 (diff)
downloadsamba-928d74914318be9a223037f25d9c0394e39e4b7e.tar.gz
samba-928d74914318be9a223037f25d9c0394e39e4b7e.tar.bz2
samba-928d74914318be9a223037f25d9c0394e39e4b7e.zip
r6920: display the SVN revision in svk build of tree's directly mirrored from samba.org
metze (This used to be commit 7feddfb5d28784ff4f7dd13075c53923d4df6330)
-rwxr-xr-xsource4/script/mkversion.sh7
1 files changed, 6 insertions, 1 deletions
diff --git a/source4/script/mkversion.sh b/source4/script/mkversion.sh
index 6f49108aba..d9d84a5337 100755
--- 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
- 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