[Qa-jenkins-scm] [jenkins.debian.net] 02/02: reproducible: fix conditional grammar in irc message

[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 df923cd62d494512e39aa2b18268f35d249e8de7
Author: Holger Levsen <holger at layer-acht.org>
Date:   Thu Jul 23 00:25:42 2015 +0200

    reproducible: fix conditional grammar in irc message
---
 bin/reproducible_scheduler.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bin/reproducible_scheduler.py b/bin/reproducible_scheduler.py
index f988d18..687ca07 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 ' + \

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