Rietveld: don't email if CQ unchecked the commit message.

appengine/chromium_rietveld/codereview/views_chromium.py

 # Copyright 2008 Google Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
 # You may obtain a copy of the License at
 #
 #     http://www.apache.org/licenses/LICENSE-2.0
 #
 # Unless required by applicable law or agreed to in writing, software
 # distributed under the License is distributed on an "AS IS" BASIS,
@@ skipping 375 matching lines @@
       request.issue.reviewers.append(request.user.email())
     # Update the issue with the checking/unchecking of the CQ box but reduce
     # spam by not emailing users.
     action = 'checked' if request.issue.commit else 'unchecked'
     commit_checked_msg = 'The CQ bit was %s by %s' % (action, user_email)
     if request.issue.cq_dry_run:
       commit_checked_msg += ' to run a CQ dry run'
       request.issue.cq_dry_run_last_triggered_by = user_email
       logging.info('CQ dry run has been triggered by %s for %d/%d', user_email,
                    request.issue.key.id(), last_patchset.key.id())
-    # Mail just the owner if the CQ bit was unchecked by someone other than the
-    # owner. More details in
+    # Mail just the owner and only if the CQ bit was unchecked by someone other
+    # than the owner or CQ itself. More details in
     # https://code.google.com/p/skia/issues/detail?id=3093
-    unchecked_by_non_owner = (user_email != request.issue.owner.email() and
-                              not request.issue.commit)
+    send_mail = (user_email != request.issue.owner.email() and
+                 user_email != views.CQ_COMMIT_BOT_EMAIL and
+                 not request.issue.commit)
     views.make_message(request, request.issue, commit_checked_msg,
-                       send_mail=unchecked_by_non_owner, auto_generated=True,
+                       send_mail=send_mail, auto_generated=True,
                        email_to=[request.issue.owner.email()]).put()
     request.issue.put()
     if request.issue.commit and not request.issue.cq_dry_run:
       views.notify_approvers_of_new_patchsets(request, request.issue)
 
   if 'builders' in request.POST:
     new_builders = filter(None, map(unicode.strip,
                                     form.cleaned_data['builders'].split(',')))
     if request.issue.private and new_builders:
       return HttpResponseBadRequest(
@@ skipping 367 matching lines @@
     next_cursor = query_iter.cursor_after()
   else:
     next_cursor = cursor
 
   logging.info('Found %d entries, returned %d' % (total, len(jobs)))
   return {
     'has_more': has_more,
     'cursor': next_cursor.urlsafe() if next_cursor else '',
     'jobs': jobs
     }