[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: silence warning if behaviour is expected

[Holger Levsen]

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

holger pushed a commit to branch master
in repository jenkins.debian.net.

commit adc9c1d097142f58792a4d34fa09c148730e02d8
Author: Holger Levsen <holger at layer-acht.org>
Date:   Sat Aug 29 12:09:07 2015 +0200

    reproducible: silence warning if behaviour is expected
---
 bin/reproducible_build.sh | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index aaa7593..9fb5e43 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -159,14 +159,14 @@ diff_copy_buildlogs() {
 			if [ ${PIPESTATUS[0]} -eq 0 ] ; then
 				echo "The two build logs are identical! \o/" | tee -a $DIFF
 			fi
-			echo -e "\nCompressing the logs..."
+			echo -e "\nCompressing the 2nd log..."
 			gzip -9vn $DIFF
 			gzip -9cvn b2/build.log > $BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build2.log.gz
 			chmod 644 $BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build2.log.gz
-		else
-			echo "Warning: No second build log" | tee -a $RBUILDLOG
-			echo "Compressing the log..."
+		elif [ $FTBFS -eq 0 ] ; then
+			echo "Warning: No second build log, what happened?" | tee -a $RBUILDLOG
 		fi
+		echo "Compressing the 1st log..."
 		gzip -9cvn b1/build.log > $BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build1.log.gz
 		chmod 644 $BASE/logs/$SUITE/$ARCH/${SRCPACKAGE}_${EVERSION}.build1.log.gz
 	else

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/qa/jenkins.debian.net.git