[Qa-jenkins-scm] [jenkins.debian.net] 01/01: handle invalid release signatures more gracefully

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit 69c250623b53c08a3c5677254d8b333ca6f7bcb5
Author: Holger Levsen <holger at layer-acht.org>
Date:   Fri Sep 11 10:42:35 2015 +0200

    handle invalid release signatures more gracefully
---
 bin/chroot-run.sh     | 2 +-
 bin/schroot-create.sh | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/bin/chroot-run.sh b/bin/chroot-run.sh
index ef1ae08..31ca1ee 100755
--- a/bin/chroot-run.sh
+++ b/bin/chroot-run.sh
@@ -57,7 +57,7 @@ bootstrap() {
 	echo "$(date -u ) - bootstraping $DISTRO into $CHROOT_TARGET now."
 	set +e
 	sudo debootstrap $BOOTSTRAP_OPTIONS $DISTRO $CHROOT_TARGET $MIRROR | tee $TMPLOG
-	local RESULT=$(egrep "E: Couldn't download packages" $TMPLOG)
+	local RESULT=$(egrep "E: (Couldn't download packages|Invalid Release signature)" $TMPLOG)
 	rm $TMPLOG
 	set -e
 	if [ ! -z "$RESULT" ] ; then
diff --git a/bin/schroot-create.sh b/bin/schroot-create.sh
index 348842c..20e5f3a 100755
--- a/bin/schroot-create.sh
+++ b/bin/schroot-create.sh
@@ -117,7 +117,7 @@ bootstrap() {
 	echo "Bootstraping $SUITE into $CHROOT_TARGET now."
 	set +e
 	sudo debootstrap $SUITE $CHROOT_TARGET $MIRROR | tee $TMPLOG
-	RESULT=$(egrep "E: Couldn't download packages" $TMPLOG)
+	RESULT=$(egrep "E: (Couldn't download packages|Invalid Release signature)" $TMPLOG)
 	set -e
 	if [ ! -z "$RESULT" ] ; then
 		echo "$(date -u) - initial debootstrap failed, sleeping 5min before retrying..."

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git