Merge branch 'master' into feature/gearman
Change-Id: I4f13e8ecfad5075ca40b66a989a5abe2c3be22fc
diff --git a/zuul/lib/gerrit.py b/zuul/lib/gerrit.py
index 5473cad..f72dd97 100644
--- a/zuul/lib/gerrit.py
+++ b/zuul/lib/gerrit.py
@@ -116,12 +116,11 @@
cmd = 'gerrit review --project %s' % project
if message:
cmd += ' --message "%s"' % message
- if action:
- for k, v in action.items():
- if v is True:
- cmd += ' --%s' % k
- else:
- cmd += ' --%s %s' % (k, v)
+ for k, v in action.items():
+ if v is True:
+ cmd += ' --%s' % k
+ else:
+ cmd += ' --%s %s' % (k, v)
cmd += ' %s' % change
out, err = self._ssh(cmd)
return err
diff --git a/zuul/trigger/gerrit.py b/zuul/trigger/gerrit.py
index 18251e4..3a2a028 100644
--- a/zuul/trigger/gerrit.py
+++ b/zuul/trigger/gerrit.py
@@ -131,8 +131,8 @@
if not change.number:
self.log.debug("Change has no number; not reporting")
return
- if not action and not message:
- self.log.debug("No action or message specified; not reporting")
+ if not action:
+ self.log.debug("No action specified; not reporting")
return
changeid = '%s,%s' % (change.number, change.patchset)
ref = 'refs/heads/' + change.branch