r23685: merge from SAMBA_4_0:

Only use the bzr and git information when there's
a .bzr or .git in the top branch directory

I use bzr for my home directory and
bzr version-info in ~/devel/samba/4.0/samba4-git
gives the info about the ~/.bzr branch

metze

diff --git a/source/script/mkversion.sh b/source/script/mkversion.sh
index e87d5ba72e119e20d3e4dfdf8e829b4084a29a78..8155c452124973e331495136bfafeeb768b26c66 100755 (executable)
--- a/source/script/mkversion.sh
+++ b/source/script/mkversion.sh
@@ -91,7 +91,7 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
        TMP_MIRRORED_REVISION=`echo -e "${SVK_INFO}" | grep 'Mirrored From:.*samba\.org.*' |sed -e 's/Mirrored From: .* Rev\..* \([0-9]*\).*/\1/'`
     fi
 
-    if test x"${HAVEVER}" != x"yes";then
+    if test x"${HAVEVER}" != x"yes" -a -d "${SOURCE_DIR}../.bzr";then
        HAVEBZR=no
        BZR_INFO=`bzr version-info --check-clean ${SOURCE_DIR} 2>/dev/null`
        TMP_REVISION=`echo -e "${BZR_INFO}" | grep 'revno:' |sed -e 's/revno: \([0-9]*\).*/\1/'`
@@ -104,7 +104,7 @@ if test x"${SAMBA_VERSION_IS_SVN_SNAPSHOT}" = x"yes";then
        TMP_CLEAN_TREE=`echo -e "${BZR_INFO}" | grep 'clean:' |sed -e 's/clean: \([a-zA-Z]*\).*/\1/'`
     fi
 
-    if test x"${HAVEVER}" != x"yes";then
+    if test x"${HAVEVER}" != x"yes" -a -d "${SOURCE_DIR}../.git";then
        HAVEGIT=no
         GIT_INFO=`git show --abbrev-commit HEAD 2>/dev/null`
        TMP_REVISION=`echo -e "${GIT_INFO}" | grep 'commit ' | sed 1q |sed -e 's/commit \([0-9a-f]*\).*/\1/'`