diff options
| author | Holger Levsen <holger@layer-acht.org> | 2014-10-05 02:39:49 +0200 |
|---|---|---|
| committer | Holger Levsen <holger@layer-acht.org> | 2014-10-05 02:39:49 +0200 |
| commit | 8431ea21f751403e24341b511eeb4491d40308c3 (patch) | |
| tree | 77401fe8353b99ff83b5b223c746e62cf1e1978c | |
| parent | 5102aee6a5c90e5faa87103595663c41253edf3f (diff) | |
| download | jenkins.debian.net-8431ea21f751403e24341b511eeb4491d40308c3.tar.xz | |
reproducible: rename diffp.html logfiles to debbindiff.html
| -rwxr-xr-x | bin/reproducible_build.sh | 10 | ||||
| -rwxr-xr-x | bin/reproducible_stats.sh | 4 |
2 files changed, 7 insertions, 7 deletions
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh index 0ce95768..9e175276 100755 --- a/bin/reproducible_build.sh +++ b/bin/reproducible_build.sh @@ -157,12 +157,12 @@ for SRCPACKAGE in ${PACKAGES} ; do set -e cat b1/${SRCPACKAGE}_${EVERSION}_amd64.changes LOGFILE=$(ls ${SRCPACKAGE}_${EVERSION}.dsc) - LOGFILE=$(echo ${LOGFILE%.dsc}.diffp.html) + LOGFILE=$(echo ${LOGFILE%.dsc}.debbindiff.html) rm -f ./results/${LOGFILE} > /dev/null 2>&1 /var/lib/jenkins/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 + rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 + rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1 figlet ${SRCPACKAGE} echo echo "${SRCPACKAGE} built successfully and reproducibly." @@ -170,8 +170,8 @@ for SRCPACKAGE in ${PACKAGES} ; do let "COUNT_GOOD=COUNT_GOOD+1" 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 + rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.diffp.log > /dev/null 2>&1 + rm -f /var/lib/jenkins/userContent/diffp/${SRCPACKAGE}_*.debbindiff.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 diff --git a/bin/reproducible_stats.sh b/bin/reproducible_stats.sh index 07f57cf0..5689fa01 100755 --- a/bin/reproducible_stats.sh +++ b/bin/reproducible_stats.sh @@ -49,8 +49,8 @@ for PKG in $BAD ; do VERSION=$(sqlite3 -init $INIT $PACKAGES_DB "SELECT version FROM source_packages WHERE name = \"$PKG\"") # remove epoch VERSION=$(echo $VERSION | cut -d ":" -f2) - if [ -f "/var/lib/jenkins/userContent/diffp/${PKG}_${VERSION}.diffp.html" ] ; then - htmlecho " <a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.diffp.html\">$PKG</a> " + if [ -f "/var/lib/jenkins/userContent/diffp/${PKG}_${VERSION}.debbindiff.html" ] ; then + htmlecho " <a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.debbindiff.html\">$PKG</a> " else htmlecho " <a href=\"$JENKINS_URL/userContent/diffp/${PKG}_${VERSION}.diffp.log\">$PKG</a> " fi |