[X2Go-Commits] [buildscripts] 03/05: bin/sbuild-deb-package: branch delete operations are non-fatal.

[git-admin at x2go.org]

This is an automated email from the git hooks/post-receive script.

x2go pushed a commit to branch master
in repository buildscripts.

commit 5291424b7cc5bd212cbb4a23631a28ed548a8275
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Fri Aug 17 15:46:25 2018 +0200

    bin/sbuild-deb-package: branch delete operations are non-fatal.
---
 bin/sbuild-deb-package | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index 19461ad..06f23fc 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -179,9 +179,9 @@ prepare_workspace() {
 			git reset --hard "origin/${CHECKOUT}"
 			git branch -D 'upstream' || true
 			git fetch origin 'upstream:upstream' || true
-			git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')"
+			git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true
 			git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true
-			git branch -D 'pristine-tar'
+			git branch -D 'pristine-tar' || true
 			git fetch origin 'pristine-tar:pristine-tar' || true
 			# and again, get the ${CHECKOUT} refspec in pure state
 			git reset --hard
@@ -198,9 +198,9 @@ prepare_workspace() {
 			git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}"
 			git branch -D 'upstream' || true
 			git fetch origin 'upstream:upstream' || true
-			git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')"
+			git branch -D "$(git for-each-ref --format='%(refname:short)' 'refs/heads/upstream/*')" || true
 			git fetch origin 'refs/heads/upstream/*:refs/heads/upstream/*' || true
-			git branch -D 'pristine-tar'
+			git branch -D 'pristine-tar' || true
 			git fetch origin 'pristine-tar:pristine-tar' || true
 			git clean -df
 		} || {

--
Alioth's /home/x2go-admin/maintenancescripts/git/hooks/post-receive-email on /srv/git/code.x2go.org/buildscripts.git