diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-11 10:42:35 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-11 10:42:35 +0200 |
| commit | 69c250623b53c08a3c5677254d8b333ca6f7bcb5 (patch) | |
| tree | d318c8386d833a6d08c0783cee3505e862071ccd /bin | |
| parent | ce073fe35ff43055812fdbeeb6304422190ccbb1 (diff) | |
| download | jenkins.debian.net-69c250623b53c08a3c5677254d8b333ca6f7bcb5.tar.xz | |
handle invalid release signatures more gracefully
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/chroot-run.sh | 2 | ||||
| -rwxr-xr-x | 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 ef1ae089..31ca1ee2 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 348842c6..20e5f3ab 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..." |