summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorsu_v <suv-sf@users.sourceforge.net>2014-09-02 22:04:23 +0000
committer~suv <suv-sf@users.sourceforge.net>2014-09-02 22:04:23 +0000
commitfb656381e443abac5d33111d38bf95d5fa3c9376 (patch)
treecfcb3976db303c63d2d445caf6e5f2295894a745
parentadd GTK+ backend to DMG filename, info file (diff)
downloadinkscape-fb656381e443abac5d33111d38bf95d5fa3c9376.tar.gz
inkscape-fb656381e443abac5d33111d38bf95d5fa3c9376.zip
osx-build.sh: don't attempt to update a bound branch
(bzr r13506.1.54)
-rwxr-xr-xpackaging/macosx/osx-build.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/packaging/macosx/osx-build.sh b/packaging/macosx/osx-build.sh
index db3b30249..135c6e2d9 100755
--- a/packaging/macosx/osx-build.sh
+++ b/packaging/macosx/osx-build.sh
@@ -267,12 +267,12 @@ then
cd $SRCROOT
if [ -z "$(bzr info | grep "checkout")" ]; then
echo "repo is unbound (branch)"
- update_cmd="bzr pull"
+ bzr pull
else
echo "repo is bound (checkout)"
- update_cmd="bzr update"
+ echo '... please update bound branch manually.'
+ false
fi
- $update_cmd
status=$?
if [[ $status -ne 0 ]]; then
echo -e "\nBZR update failed"