From 942e7385b65bfca624ea26568f401e691f2f861c Mon Sep 17 00:00:00 2001 From: Nathan Cutler Date: Wed, 30 Oct 2019 11:44:56 +0100 Subject: [PATCH] backport-resolve-issue: recognize that Target version is populated Due to a regression, the script stopped recognizing that a Backport tracker issue's "Target version" field is populated. Fixes: af43b3cc3b05e70ec248ad5c23da6fbd4c2e78a1 Signed-off-by: Nathan Cutler --- src/script/backport-resolve-issue | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/src/script/backport-resolve-issue b/src/script/backport-resolve-issue index ee4ff7684efc6..c5df15f1f48fc 100755 --- a/src/script/backport-resolve-issue +++ b/src/script/backport-resolve-issue @@ -175,13 +175,6 @@ def get_project(r, p_id): project_id2project[p_id] = p_obj return project_id2project[p_id] -def get_tracker_target_version(redmine_issue): - if redmine_issue.fixed_version: - logging.debug("Target version: ID {}, name {}" - .format(self.redmine_issue.fixed_version.id, self.redmine_issue.fixed_version.name)) - return self.redmine_issue.fixed_version.name - return None - def has_tracker(r, p_id, tracker_name): for tracker in get_project(r, p_id).trackers: if tracker['name'] == tracker_name: @@ -431,7 +424,7 @@ Ceph version: base {}, target {}'''.format(self.github_url, pr_title_trunc, # # is the Backport Tracker's "Target version" custom field populated? try: - ttv = self.get_tracker_target_version(bt.redmine_issue) + ttv = bt.get_tracker_target_version() except: logging.info("Backport Tracker {} target version not populated yet!" .format(bt.issue_id)) @@ -535,6 +528,13 @@ class BackportTracker(Backport): self.issue_id = issue_id self.parent = backport_obj + def get_tracker_target_version(self): + if self.redmine_issue.fixed_version: + logging.debug("Target version: ID {}, name {}" + .format(self.redmine_issue.fixed_version.id, self.redmine_issue.fixed_version.name)) + return self.redmine_issue.fixed_version.name + return None + def issue_url(self): return "{}/issues/{}".format(redmine_endpoint, self.issue_id) -- 2.39.5