bugzilla-close-candidate.py: Fix sorting of branches.

Message ID 8aed5e0c-b3a5-8f97-328f-780362d4be82@suse.cz
State New
Headers show
Series
  • bugzilla-close-candidate.py: Fix sorting of branches.
Related show

Commit Message

Martin Liška May 29, 2020, 2:38 p.m.
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(-)

-- 
2.26.2

Patch

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)