[X2Go-Commits] [buildscripts] 01/01: bin/sbuild-deb-package: further ignore non-existent upstream branch, we really only care for upstream/${upstream_version} branches.

[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 04dc4df48e460dac97874f65bd70cbcc0e56e8b1
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 30 22:57:39 2018 +0200

    bin/sbuild-deb-package: further ignore non-existent upstream branch, we really only care for upstream/${upstream_version} branches.
---
 bin/sbuild-deb-package | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index d2c430b..044cfd9 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -330,7 +330,7 @@ build_packages() {
 				# we always build native packages for our repos
 				SA_OPTION=""
 				test -f "debian/source/format" && grep -Eqs '^3.0.*\(quilt\)$' "debian/source/format" && {
-					git fetch origin upstream:upstream
+					git fetch origin upstream:upstream || true
 					#                                                                                    v remove epoch  v remove debian revision
 					UPSTREAM_VERSION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/^.*://' -e 's/-[^-]*$//')"
 					REVISION="$(dpkg-parsechangelog | grep "Version:" | cut -d " " -f2 | sed -e 's/.*-//')"

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