From 457b72ec3ce08e11d6beb6bf39e7c13b3c47900b Mon Sep 17 00:00:00 2001
From: su_v <suv-sf@users.sourceforge.net>
Date: Mon, 25 Aug 2014 01:20:48 +0200
Subject: osx-build.sh: if repo is checkout use 'bzr update', else 'bzr pull'.
 (is there a better way to check binding state with bzr?)

(bzr r13506.1.43)
---
 packaging/macosx/osx-build.sh | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index b82b038c8..8c759b6e1 100755
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -262,7 +262,14 @@ function getinkscapeinfo () {
 if [[ "$BZRUPDATE" == "t" ]]
 then
 	cd $SRCROOT
-	bzr pull
+	if [ -z "$(bzr info | grep "checkout")" ]; then
+		echo "repo is unbound (branch)"
+		update_cmd="bzr pull"
+	else
+		echo "repo is bound (checkout)"
+		update_cmd="bzr update"
+	fi
+	$update_cmd
 	status=$?
 	if [[ $status -ne 0 ]]; then
 		echo -e "\nBZR update failed"
-- 
cgit v1.2.3