diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-09-20 20:29:30 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-09-20 20:29:30 +0200 |
| commit | 276736e8b7e17918e50d83bc1b031fa92c554ad9 (patch) | |
| tree | ea69ebcbfdd4fd24d69fb497ff69457d95605e2c | |
| parent | 439dec1a0d785a1b6afdbc79970012e53ca837ae (diff) | |
| download | jenkins.debian.net-276736e8b7e17918e50d83bc1b031fa92c554ad9.tar.xz | |
reproducible: be true
| -rwxr-xr-x | bin/reproducible_build.sh | 4 | ||||
| -rwxr-xr-x | bin/reproducible_common.sh | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 4c1208f2..6919b768 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -306,7 +306,7 @@ call_diffoscope_on_changes_files() { # TEMP is recognized by python's tempfile module to create temp stuff inside local TEMP=$(mktemp --tmpdir=$TMPDIR -d dbd-tmp-XXXXXXX) DIFFOSCOPE="$(schroot --directory $TMPDIR -c source:jenkins-reproducible-${DBDSUITE}-diffoscope diffoscope -- --version 2>&1 || true)" - LOG_RESULT=$(echo $DIFFOSCOPE | grep '^E: 15binfmt: update-binfmts: unable to open') + LOG_RESULT=$(echo $DIFFOSCOPE | grep '^E: 15binfmt: update-binfmts: unable to open' || true) if [ ! -z "LOG_RESULT" ] ; then echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not availble, will sleep 2min and retry." sleep 2m @@ -326,7 +326,7 @@ call_diffoscope_on_changes_files() { $TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_${ARCH}.changes" \ 2>&1 ) >> $TMPLOG RESULT=$? - LOG_RESULT=$(grep '^E: 15binfmt: update-binfmts: unable to open' $TMPLOG) + LOG_RESULT=$(grep '^E: 15binfmt: update-binfmts: unable to open' $TMPLOG || true) if [ ! -z "LOG_RESULT" ] ; then rm -f $TMPLOG $TMPDIR/${DBDREPORT} $TMPDIR/$DBDTXT echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not availble, will sleep 2min and retry." diff --git a/bin/reproducible_common.sh b/bin/reproducible_common.sh index c6e8a9fa..99acef4f 100755 --- a/bin/reproducible_common.sh +++ b/bin/reproducible_common.sh @@ -441,7 +441,7 @@ call_diffoscope() { $TMPDIR/b2/$1/$2 2>&1 \ ) 2>&1 >> $TMPLOG RESULT=$? - LOG_RESULT=$(grep '^E: 15binfmt: update-binfmts: unable to open' $TMPLOG) + LOG_RESULT=$(grep '^E: 15binfmt: update-binfmts: unable to open' $TMPLOG || true) if [ ! -z "LOG_RESULT" ] ; then rm -f $TMPLOG $TMPDIR/$1/$2.html echo "$(date -u) - schroot jenkins-reproducible-${DBDSUITE}-diffoscope not availble, will sleep 2min and retry." |