Gentoo Archives: gentoo-portage-dev

From: "Michał Górny" <mgorny@g.o>
To: gentoo-portage-dev@l.g.o
Cc: "Michał Górny" <mgorny@g.o>
Subject: [gentoo-portage-dev] [PATCH 3/6] eshowkw: Sort all multi-component keywords after normal
Date: Tue, 23 Jan 2018 12:47:43
Message-Id: 20180123124715.3456-4-mgorny@gentoo.org
In Reply to: [gentoo-portage-dev] [gentoolkit] eshowkw: Improve & reorder keywords for my Bugzie proposal by "Michał Górny"
1 Add component count (implied by the count of '-' separators) to sort
2 criteria. This ensures that *-fbsd sorts after regular arches, much like
3 we list it in Bugzilla.
4 ---
5 pym/gentoolkit/eshowkw/keywords_header.py | 2 +-
6 1 file changed, 1 insertion(+), 1 deletion(-)
7
8 diff --git a/pym/gentoolkit/eshowkw/keywords_header.py b/pym/gentoolkit/eshowkw/keywords_header.py
9 index 5516a72..bb4bf91 100644
10 --- a/pym/gentoolkit/eshowkw/keywords_header.py
11 +++ b/pym/gentoolkit/eshowkw/keywords_header.py
12 @@ -129,7 +129,7 @@ class keywords_header:
13 levels[kw] = level
14 break
15
16 - normal.sort(key=lambda kw: (levels.get(kw, 99), kw))
17 + normal.sort(key=lambda kw: (levels.get(kw, 99), kw.count('-'), kw))
18 return normal
19
20 def __readAdditionalFields(self):
21 --
22 2.16.1