Merge branch 'master' into feature/gearman

Change-Id: I4f13e8ecfad5075ca40b66a989a5abe2c3be22fc
This commit is contained in:
James E. Blair 2013-05-15 08:55:19 -07:00
commit d8d95070ca
2 changed files with 7 additions and 8 deletions

View File

@ -116,12 +116,11 @@ class Gerrit(object):
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

View File

@ -131,8 +131,8 @@ class Gerrit(object):
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