[Qa-jenkins-scm] [jenkins.debian.net] 01/01: reproducible: avoid double irc notification when a packages with notification enabled becomes unreproducible

[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 45681a26220ce1b4a522c0b412acb937ccf492fa
Author: Holger Levsen <holger at layer-acht.org>
Date:   Wed Jun 17 12:32:55 2015 +0200

    reproducible: avoid double irc notification when a packages with notification enabled becomes unreproducible
---
 TODO                      | 1 -
 bin/reproducible_build.sh | 4 ++++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/TODO b/TODO
index 0f2f08a..9d9f047 100644
--- a/TODO
+++ b/TODO
@@ -199,7 +199,6 @@ properties:
 ** reproducible_blacklist.sh should delete rbuild logs and debbindiff output too
 ** adopt usertag script from pkg-apparmor to notify us about new usertagged bugs automatically
 ** fix apache ssl configuration as hinted by eg https://sslcheck.globalsign.com/de/sslcheck?host=jenkins.debian.net#46.16.73.183
-** when irc notification is enabled and a package changes from reproducible to unreproducible, we get two notifications on irc, saying (basically) the same. there should only be one in these cases.
 
 * notes related
 ** #786396: classify issue by "toolchain" or "package" fix needed
diff --git a/bin/reproducible_build.sh b/bin/reproducible_build.sh
index f3d59b0..38abb2d 100755
--- a/bin/reproducible_build.sh
+++ b/bin/reproducible_build.sh
@@ -191,6 +191,10 @@ handle_ftbr() {
 		MESSAGE="status changed from reproducible → unreproducible. ${REPRODUCIBLE_URL}/${SUITE}/${ARCH}/${SRCPACKAGE}"
 		echo "\n$MESSAGE" | tee -a ${RBUILDLOG}
 		irc_message "$MESSAGE"
+		# disable ("regular") irc notification unless it's due to debbindiff problems
+		if [ ! -z "$NOTIFY" ] && [ "$NOTIFY" != "debbindiff" ] ; then
+			NOTIFY=""
+		fi
 	fi
 }
 

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