[X2Go-Commits] [buildscripts] 01/01: bin/{sbuild-deb, build-rpm}-package: don't fail when cloning into new staging directories and the upstream origin does not exist.

[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 e70321a1c55b878d230d601ac377e1a94df618c5
Author: Mihai Moldovan <ionic at ionic.de>
Date:   Sat Jun 30 06:29:04 2018 +0200

    bin/{sbuild-deb,build-rpm}-package: don't fail when cloning into new staging directories and the upstream origin does not exist.
---
 bin/build-rpm-package  | 2 +-
 bin/sbuild-deb-package | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/build-rpm-package b/bin/build-rpm-package
index 4990625..e8f0728 100755
--- a/bin/build-rpm-package
+++ b/bin/build-rpm-package
@@ -768,7 +768,7 @@ prepare_workspace() {
 			git clone "git://${GIT_HOSTNAME}/${PROJECT_PATH}.git"
 			cd "${PROJECT}"
 			git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}"
-			git fetch origin upstream:upstream
+			git fetch origin upstream:upstream || true
 			git fetch origin pristine-tar:pristine-tar || true
 			git clean -df
 		} || {
diff --git a/bin/sbuild-deb-package b/bin/sbuild-deb-package
index aaab203..1a10778 100755
--- a/bin/sbuild-deb-package
+++ b/bin/sbuild-deb-package
@@ -191,7 +191,7 @@ prepare_workspace() {
 			git clone "git://${GIT_HOSTNAME}/${PROJECT_PATH}.git"
 			cd "${PROJECT}"
 			git checkout --force "${CHECKOUT}" || git checkout --force -b "${CHECKOUT}"
-			git fetch origin upstream:upstream
+			git fetch origin upstream:upstream || 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