diff options
| author | Steve Varnau <steve.varnau@hp.com> | 2014-08-14 02:20:30 +0000 |
|---|---|---|
| committer | Steve Varnau <steve.varnau@hp.com> | 2014-08-15 20:24:10 +0000 |
| commit | f3348a7620eab97ee473f53321206a5ccc158202 (patch) | |
| tree | 129de25e9d9e9eea612ee6dd8245872d864fe321 | |
| parent | c878c98977a5531af206f41bd3b34385d9306d78 (diff) | |
| download | zuul-f3348a7620eab97ee473f53321206a5ccc158202.tar.gz | |
Update gerrit change attributes even if merged
Function updateChange short-cuts dependency checking for merged changes, but
some attributes that need to be updated were after the short-cut return.
This resulted in zuul saying status is MERGED, but then not matching
Changeish filter for status MERGED.
Closes-Bug: 1356662
Change-Id: I954b2716a5af75a959d4129ba88d7dae0750d2a5
| -rw-r--r-- | zuul/trigger/gerrit.py | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/zuul/trigger/gerrit.py b/zuul/trigger/gerrit.py index 6a2c362eb..2be3799b1 100644 --- a/zuul/trigger/gerrit.py +++ b/zuul/trigger/gerrit.py @@ -361,6 +361,10 @@ class Gerrit(object): change.is_current_patchset = False change.is_merged = self._isMerged(change) + change.approvals = data['currentPatchSet'].get('approvals', []) + change.open = data['open'] + change.status = data['status'] + if change.is_merged: # This change is merged, so we don't need to look any further # for dependencies. @@ -383,10 +387,6 @@ class Gerrit(object): if not dep.is_merged and dep.is_current_patchset: change.needed_by_changes.append(dep) - change.approvals = data['currentPatchSet'].get('approvals', []) - change.open = data['open'] - change.status = data['status'] - return change def getGitUrl(self, project): |