[Reproducible-commits] [misc] 01/01: prebuilder: save diffoscope text diffs

[Reiner Herrmann]

This is an automated email from the git hooks/post-receive script.

deki-guest pushed a commit to branch master
in repository misc.

commit a0b83e6b28f5eb2e802e8777249b06f48aa2b146
Author: Reiner Herrmann <reiner at reiner-h.de>
Date:   Sat Nov 28 11:02:14 2015 +0100

    prebuilder: save diffoscope text diffs
---
 prebuilder/pbuilderhooks/B92_diffoscope | 8 ++++----
 prebuilder/rebuild.sh                   | 8 +++++---
 2 files changed, 9 insertions(+), 7 deletions(-)

diff --git a/prebuilder/pbuilderhooks/B92_diffoscope b/prebuilder/pbuilderhooks/B92_diffoscope
index 1e2bd3a..9bce838 100755
--- a/prebuilder/pbuilderhooks/B92_diffoscope
+++ b/prebuilder/pbuilderhooks/B92_diffoscope
@@ -14,9 +14,9 @@ rm /tmp/buildd/initial_build.tar
 
 echo "I: installing diffoscope and running it on the package"
 apt-get install -y --install-recommends --force-yes sudo diffoscope 2>&1 > /dev/null
-touch /tmp/buildd/diffoscope.html
-chown nobody /tmp/buildd/diffoscope.html
-if sudo -u nobody diffoscope --html /tmp/buildd/diffoscope.html /tmp/initial_build/*.changes /tmp/buildd/*.changes; then
+touch /tmp/buildd/diffoscope.{txt,html}
+chown nobody /tmp/buildd/diffoscope.{txt,html}
+if sudo -u nobody diffoscope --text /tmp/buildd/diffoscope.txt --html /tmp/buildd/diffoscope.html /tmp/initial_build/*.changes /tmp/buildd/*.changes; then
 	echo
 	echo "                              _            _ _     _      "
 	echo " _ __ ___ _ __  _ __ ___   __| |_   _  ___(_) |__ | | ___ "
@@ -25,5 +25,5 @@ if sudo -u nobody diffoscope --html /tmp/buildd/diffoscope.html /tmp/initial_bui
 	echo "|_|  \___| .__/|_|  \___/ \__,_|\__,_|\___|_|_.__/|_|\___|"
 	echo "         |_|                                              "
 	echo
-	rm -f /tmp/buildd/diffoscope.html
+	rm -f /tmp/buildd/diffoscope.{txt,html}
 fi
diff --git a/prebuilder/rebuild.sh b/prebuilder/rebuild.sh
index 0acde5d..5b61556 100755
--- a/prebuilder/rebuild.sh
+++ b/prebuilder/rebuild.sh
@@ -68,6 +68,8 @@ sudo \
 xz < logs/${PACKAGE}.build2 > logs/${PACKAGE}.build2.xz
 rm -f logs/${PACKAGE}.build2
 
-if [ -f b2/diffoscope.html ]; then
-	mv b2/diffoscope.html logs/${PACKAGE}.diffoscope.html
-fi
+[ -f b2/diffoscope.html ] && mv b2/diffoscope.html logs/${PACKAGE}.diffoscope.html
+[ -f b2/diffoscope.txt ] && {
+	xz < b2/diffoscope.txt > logs/${PACKAGE}.diffoscope.txt.xz
+	rm -f b2/diffoscope.txt
+}

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/misc.git