diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-11 16:17:14 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-11 16:17:14 +0200 |
| commit | 1e2bc3633e18ed8ef7c629257d5dd871a3e6a316 (patch) | |
| tree | f9939e5ff30a284f38892bbcb54adc47e365cafd /bin | |
| parent | 8758d820d6ee4b668f70210ec594b90ba58ab075 (diff) | |
| download | jenkins.debian.net-1e2bc3633e18ed8ef7c629257d5dd871a3e6a316.tar.xz | |
reproducible: more gracefully deal with problems downloading the sources
Diffstat (limited to 'bin')
| -rwxr-xr-x | bin/reproducible_build.sh | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 1d0df4c6..371576ed 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -413,7 +413,8 @@ get_source_package() { schroot --directory $TMPDIR -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source --print-uris source ${SRCPACKAGE} | grep \.dsc|cut -d " " -f1|xargs wget || true RESULT=$? fi - if [ $RESULT != 0 ] || [ "$(ls ${SRCPACKAGE}_*.dsc 2> /dev/null)" = "" ] ; then + PARSED_RESULT=$(egrep 'E: Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway)' ${RBUILDLOG}) + if [ $RESULT != 0 ] || [ "$(ls ${SRCPACKAGE}_*.dsc 2> /dev/null)" = "" ] || [ ! -z "$PARSED_RESULT" ] ; then # sometimes apt-get cannot download a package for whatever reason. # if so, wait some time and try again. only if that fails, give up. echo "$(date -u ) - download of ${SRCPACKAGE} sources from ${SUITE} failed." | tee -a ${RBUILDLOG} @@ -428,8 +429,9 @@ get_source_package() { schroot --directory $TMPDIR -c source:jenkins-reproducible-$SUITE apt-get -- --download-only --only-source --print-uris source ${SRCPACKAGE} | grep \.dsc|cut -d " " -f1|xargs wget || true RESULT=$? fi + PARSED_RESULT=$(egrep 'E: Failed to fetch.*(Unable to connect to|Connection failed|Size mismatch|Cannot initiate the connection to|Bad Gateway)' ${RBUILDLOG}) fi - if [ $RESULT != 0 ] || [ "$(ls ${SRCPACKAGE}_*.dsc 2> /dev/null)" = "" ] ; then + if [ $RESULT != 0 ] || [ "$(ls ${SRCPACKAGE}_*.dsc 2> /dev/null)" = "" ] || [ ! -z "$PARSED_RESULT" ] ; then if [ "$MODE" = "legacy" ] || [ "$MODE" = "ng" ] ; then handle_404 else |