From 5e54b01f2b5cc7fd7c3523563e2db751e0706ff6 Mon Sep 17 00:00:00 2001 From: Martin Liska Date: Fri, 29 May 2020 16:37:48 +0200 Subject: [PATCH] bugzilla-close-candidate.py: Fix sorting of branches. Pushed to master. maintainer-scripts/ChangeLog: * bugzilla-close-candidate.py: Fix sorting of branches. --- maintainer-scripts/bugzilla-close-candidate.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/maintainer-scripts/bugzilla-close-candidate.py b/maintainer-scripts/bugzilla-close-candidate.py index 9c95f2bf3eb..cdace9763e7 100755 --- a/maintainer-scripts/bugzilla-close-candidate.py +++ b/maintainer-scripts/bugzilla-close-candidate.py @@ -91,9 +91,10 @@ def search(): if skip: continue - branches = get_branches_by_comments(comments) - if len(branches): - branches_str = ','.join(sorted(list(branches))) + branches = sorted(list(get_branches_by_comments(comments)), + key=lambda b: 999 if b is 'master' else int(b)) + if branches: + branches_str = ','.join(branches) print('%-30s%-30s%-40s%-40s%-60s' % ('https://gcc.gnu.org/PR%d' % id, branches_str, fail, work, b['summary']), flush=True) ids.append(id) -- 2.30.2