diff options
| author | Holger Levsen <holger@layer-acht.org> | 2015-01-14 16:04:35 +0100 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2015-01-14 16:04:35 +0100 |
| commit | 96ca40f93167b5e7d201691b95c48f305cbf52cf (patch) | |
| tree | 44b20a7b9ddfec712988fa20606684481c8b92a4 | |
| parent | bb736d659edde529a477cc3c22902b097558f0b2 (diff) | |
| download | jenkins.debian.net-96ca40f93167b5e7d201691b95c48f305cbf52cf.tar.xz | |
reproducible: remove workaround for debbindiff 3 and explain in rbuild outwhich which debbindiff version is used
| -rwxr-xr-x | bin/reproducible_build.sh | 9 |
1 files changed, 2 insertions, 7 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index a9141d36..66a4c31d 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -155,6 +155,7 @@ else # write locks are only done by the schroot setup job touch $DBDCHROOT_READLOCK fi + echo "$(date) - $(schroot --directory /tmp -c source:jenkins-reproducible-sid debbindiff -- --version) will be used to compare the two builds now." | tee -a ${RBUILDLOG} ( timeout 15m schroot --directory /tmp -c source:jenkins-reproducible-sid debbindiff -- --html $TMPDIR/${LOGFILE} $TMPDIR/b1/${SRCPACKAGE}_${EVERSION}_amd64.changes $TMPDIR/b2/${SRCPACKAGE}_${EVERSION}_amd64.changes ) 2>&1 >> ${RBUILDLOG} RESULT=$? set +x @@ -183,13 +184,7 @@ else cp b1/${BUILDINFO} /var/lib/jenkins/userContent/buildinfo/ > /dev/null 2>&1 || true if [ -f ./${LOGFILE} ] ; then echo -n "$DEBBINDIFFOUT" | tee -a ${RBUILDLOG} - # FIXME: work around debbindiff not having external CSS support (#764470) - # should really be fixed in debbindiff and just moved.... - if grep -q "Generated by debbindiff 3" ./${LOGFILE} ; then - sed '/\<style\>/,/<\/style>/{//!d}' ./${LOGFILE} |grep -v "style>" | sed -s 's#</head># <meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />\n <link href="../static/style_dbd.css" type="text/css" rel="stylesheet" />\n</head>#' > /var/lib/jenkins/userContent/dbd/${LOGFILE} - else - mv ./${LOGFILE} /var/lib/jenkins/userContent/dbd/ - fi + mv ./${LOGFILE} /var/lib/jenkins/userContent/dbd/ else echo -n ", debbindiff produced no output (which is strange)" fi |