From 201d61faf1e8669e7e62179ad1c2bb918523de8b Mon Sep 17 00:00:00 2001
From: Mattia Rizzolo <mattia@mapreri.org>
Date: Tue, 16 Jun 2015 23:59:06 +0000
Subject: reproducible: builds: be verbose while creating/deleting
 directories/files instead of > /dev/null. Also handle the .gz versions by
 appending {,.gz} to gzippable files. Those output will end up in the jenkins
 log only, so it won't clutter stuff under rb.d.n

---
 bin/reproducible_build.sh | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index d307bd35..eba6798f 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -20,11 +20,12 @@ ARCH="amd64"
 /bin/sleep $(echo "scale=1 ; $(shuf -i 1-120 -n 1)/10" | bc )
 
 create_results_dirs() {
-	mkdir -p $BASE/dbd/${SUITE}/${ARCH}
-	mkdir -p $BASE/logs/${SUITE}/${ARCH}
-	mkdir -p $BASE/logdiffs/${SUITE}/${ARCH}
-	mkdir -p $BASE/rbuild/${SUITE}/${ARCH}
-	mkdir -p $BASE/buildinfo/${SUITE}/${ARCH}
+	mkdir -vp $BASE/dbd/${SUITE}/${ARCH}
+	mkdir -vp $BASE/dbdtxt/${SUITE}/${ARCH}
+	mkdir -vp $BASE/logs/${SUITE}/${ARCH}
+	mkdir -vp $BASE/logdiffs/${SUITE}/${ARCH}
+	mkdir -vp $BASE/rbuild/${SUITE}/${ARCH}
+	mkdir -vp $BASE/buildinfo/${SUITE}/${ARCH}
 }
 
 handle_race_condition() {
@@ -105,11 +106,12 @@ cleanup_all() {
 }
 
 cleanup_userContent() {
-	rm -f $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_*.rbuild.log > /dev/null 2>&1
-	rm -f $BASE/logs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.build?.log > /dev/null 2>&1
-	rm -f $BASE/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.html > /dev/null 2>&1
-	rm -f $BASE/buildinfo/${SUITE}/${ARCH}/${SRCPACKAGE}_*.buildinfo > /dev/null 2>&1
-	rm -f $BASE/logdiffs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.diff > /dev/null 2>&1
+	rm -vf $BASE/rbuild/${SUITE}/${ARCH}/${SRCPACKAGE}_*.rbuild.log{,.gz}
+	rm -vf $BASE/logs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.build?.log{,.gz}
+	rm -vf $BASE/dbd/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.html
+	rm -vf $BASE/dbdtxt/${SUITE}/${ARCH}/${SRCPACKAGE}_*.debbindiff.txt{,.gz}
+	rm -vf $BASE/buildinfo/${SUITE}/${ARCH}/${SRCPACKAGE}_*.buildinfo
+	rm -vf $BASE/logdiffs/${SUITE}/${ARCH}/${SRCPACKAGE}_*.diff{,.gz}
 }
 
 update_db_and_html() {
-- 
cgit v1.2.3-70-g09d2