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
This commit is contained in:
Steve Varnau 2014-08-14 02:20:30 +00:00
parent c878c98977
commit f3348a7620
1 changed files with 4 additions and 4 deletions

View File

@ -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):