RepoMirrors/ceph
1
0
Fork 0
mirror of https://github.com/ceph/ceph synced 2024-12-28 06:23:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

backport-resolve-issue: extract PR number more carefully

Browse Source 
This addresses cases where the previous regex '\\d++' was promiscuously
matching strings of digits that were not GitHub PR IDs.

Signed-off-by: Nathan Cutler <ncutler@suse.com>
This commit is contained in:
Nathan Cutler 2020-02-10 11:46:50 +01:00
parent 5959ac25c7
commit 9ea48e8f7e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/script/backport-resolve-issue
View File

@ -510,12 +510,13 @@ Ceph version: base {}, target {}'''.format(self.github_url, pr_title_trunc,
def populate_github_url(self):
global github_endpoint
# GitHub PR ID from merge commit string
p = re.compile('\\d+')
p = re.compile('(pull request|PR) #(\\d+)')
try:
self.github_pr_id = p.search(self.merge_commit_description).group()
self.github_pr_id = p.search(self.merge_commit_description).group(2)
except AttributeError:
assert False, \
"Failed to extract GitHub PR ID from merge commit string ->{}<-".format(self.merge_commit_string)
logging.debug("Merge commit string: {}".format(self.merge_commit_string))
logging.debug("GitHub PR ID from merge commit string: {}".format(self.github_pr_id))
self.github_url = "{}/pull/{}".format(github_endpoint, self.github_pr_id)