summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-06-17 12:32:55 +0200
committerHolger Levsen <holger@layer-acht.org>2015-06-17 12:32:55 +0200
commit45681a26220ce1b4a522c0b412acb937ccf492fa (patch)
tree4ffca42c9ed2eb97c91cc157a2b4cdba2fab3e00
parentba15ed7a425adea87755756fda85153bbf6637b3 (diff)
downloadjenkins.debian.net-45681a26220ce1b4a522c0b412acb937ccf492fa.tar.xz
reproducible: avoid double irc notification when a packages with notification enabled becomes unreproducible
-rw-r--r--TODO1
-rwxr-xr-xbin/reproducible_build.sh4
2 files changed, 4 insertions, 1 deletions
diff --git a/TODO b/TODO
index 0f2f08a6..9d9f0477 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 f3d59b0e..38abb2d4 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
}