diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-10-05 16:28:45 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-10-05 16:28:45 +0200 |
| commit | 2d6e2e4df8557f9671480da2b5819bacfac93209 (patch) | |
| tree | cc5f14e654472e3b32e708a098411982860ff129 | |
| parent | 18cdd3851b60362cc2dd58653e48fe6fb5e55528 (diff) | |
| download | jenkins.debian.net-2d6e2e4df8557f9671480da2b5819bacfac93209.tar.xz | |
reproducible: handle stderr better
| -rwxr-xr-x | bin/reproducible_build.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 16bbad12..d1969d66 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -157,7 +157,7 @@ for SRCPACKAGE in ${PACKAGES} ; do SKIPPED="${SRCPACKAGE} ${SKIPPED}" continue fi - sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_*.dsc | tee -a ${RBUILDLOG} + sudo DEB_BUILD_OPTIONS="parallel=$NUM_CPU" pbuilder --build --debbuildopts "-b" --basetgz /var/cache/pbuilder/base-reproducible.tgz --distribution sid ${SRCPACKAGE}_*.dsc 2>&1 | tee -a ${RBUILDLOG} if [ -f /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes ] ; then mkdir b1 b2 dcmd cp /var/cache/pbuilder/result/${SRCPACKAGE}_${EVERSION}_amd64.changes b1 @@ -170,7 +170,7 @@ for SRCPACKAGE in ${PACKAGES} ; do LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc) LOGFILE=$(echo ${LOGFILE%.dsc}.debbindiff.html) BUILDINFO=${SRCPACKAGE}_${EVERSION}_amd64.buildinfo - /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes || true + /var/lib/jenkins/debbindiff.git/debbindiff.py --html ./${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes > /dev/null || true if [ ! -f ./${LOGFILE} ] && [ -f b1/${BUILDINFO} ] ; then cleanup_userContent cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/ |