Apply changeset 15688 to branch

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.6@15693 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/gosa-core/contrib/make-gosa-package b/gosa-core/contrib/make-gosa-package
index 972bb9554942f6a7e4ad55ba5276dd26f7d38994..297eb5920bc2e62a5fd6f753728caa1580c83d72 100755 (executable)
--- a/gosa-core/contrib/make-gosa-package
+++ b/gosa-core/contrib/make-gosa-package
@@ -111,11 +111,13 @@ then
        BRANCH_REV=$(LANG=C svn info gosa-info | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p')
        rm -rf gosa-info
 
-        echo "Loading svn information for goto '${BRANCH}'..."
-        svn co -N https://oss.gonicus.de/repositories/goto/${BRANCH} goto-info/ > /dev/null
-        GOTO_BRANCH_REV=$(LANG=C svn info goto-info | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p')
-        rm -rf goto-info
-
+       if [ "$GOTO" = "use" ]
+               then
+               echo "Loading svn information for goto '${BRANCH}'..."
+               svn co -N https://oss.gonicus.de/repositories/goto/${BRANCH} goto-info/ > /dev/null
+               GOTO_BRANCH_REV=$(LANG=C svn info goto-info | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p')
+               rm -rf goto-info
+       fi
 else
         echo "Loading svn information for gosa '${BRANCH}' from local checkout ..."
        BRANCH_REV=$(LANG=C svn info $EXTRACT/gosa-core | sed -n -e 's/^Last Changed Rev: \([0-9]*\).*$/\1/p')