summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHolger Levsen <holger@layer-acht.org>2015-07-23 00:25:42 +0200
committerHolger Levsen <holger@layer-acht.org>2015-07-23 00:25:42 +0200
commitdf923cd62d494512e39aa2b18268f35d249e8de7 (patch)
tree153f76e5be6c116b7ccbeebd9aa304ffa2d1aedc
parent7e16e04cc9985596ec9200f6964b8f58c91409bc (diff)
downloadjenkins.debian.net-df923cd62d494512e39aa2b18268f35d249e8de7.tar.xz
reproducible: fix conditional grammar in irc message
-rwxr-xr-xbin/reproducible_scheduler.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index f988d181..687ca07f 100755
--- a/bin/reproducible_scheduler.py
+++ b/bin/reproducible_scheduler.py
@@ -332,7 +332,7 @@ def scheduler():
message += msg_untested
message += ' and ' if msg_new and msg_old else ', ' if msg_new or msg_old else ''
message += msg_new if msg_new else ''
- message += ' and ' if msg_untested or msg_old and msg_untested else ''
+ message += ' and ' if ( msg_untested and not msg_new ) or ( msg_old and msg_untested ) else ''
message += msg_old if msg_old else ''
total = [now_queued_here[x] for x in SUITES]
message += ', for ' + str(sum(total)) + ' or ' + \