From: janw Date: Wed, 24 Feb 2010 11:42:05 +0000 (+0000) Subject: Apply changeset 15688 to branch X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=e3a3e5400d796ea328fb3786b65c00811533f9ef;p=gosa.git 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 972bb9554..297eb5920 100755 --- 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')