From 07edb6d9c253cb4cabcad7450cac9dddbfeda8aa Mon Sep 17 00:00:00 2001 From: Holger Levsen Date: Tue, 30 Sep 2014 18:07:36 +0200 Subject: bugfix --- bin/reproducible_build.sh | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'bin') diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 6f7f6bbf..f1e62bdc 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -183,9 +183,11 @@ for SRCPACKAGE in ${PACKAGES} ; do cat b1/${SRCPACKAGE}_${EVERSION}_amd64.changes LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc) LOGFILE=$(echo ${LOGFILE%.dsc}.diffp.html) - ./debbindiff.git/debbindiff.py --html ./results/${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes - if ! $(grep -qv '^\*\*\*\*\*' ./results/${LOGFILE}) ; then + rm -f ./results/${LOGFILE} > /dev/null 2>&1 + ./debbindiff.git/debbindiff.py --html ./results/${LOGFILE} b1/${SRCPACKAGE}_${EVERSION}_amd64.changes b2/${SRCPACKAGE}_${EVERSION}_amd64.changes || true + if [ ! -f ./results/${LOGFILE} ] ; then rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 + rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.html > /dev/null 2>&1 figlet ${SRCPACKAGE} echo echo "${SRCPACKAGE} built successfully and reproducibly." @@ -194,6 +196,7 @@ for SRCPACKAGE in ${PACKAGES} ; do GOOD="${SRCPACKAGE} ${GOOD}" else rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 + rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.html > /dev/null 2>&1 cp ./results/${LOGFILE} /var/lib/jenkins/userContent/diffp/ sqlite3 -init $INIT ${PACKAGES_DB} "REPLACE INTO source_packages VALUES (\"${SRCPACKAGE}\", \"${VERSION}\", \"unreproducible\", \"$DATE\", \"\")" set +x -- cgit v1.2.3-54-g00ecf