Gentoo Archives: gentoo-commits

From: "Michał Górny" <mgorny@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/gentoolkit:master commit in: pym/gentoolkit/eshowkw/
Date: Fri, 26 Jan 2018 23:25:44
Message-Id: 1516978250.ba6be5523dfd11bd675be2d705d0f6ba3dec3a0c.mgorny@gentoo
1 commit: ba6be5523dfd11bd675be2d705d0f6ba3dec3a0c
2 Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
3 AuthorDate: Tue Jan 23 12:14:29 2018 +0000
4 Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
5 CommitDate: Fri Jan 26 14:50:50 2018 +0000
6 URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=ba6be552
7
8 eshowkw: Sort all multi-component keywords after normal
9
10 Add component count (implied by the count of '-' separators) to sort
11 criteria. This ensures that *-fbsd sorts after regular arches, much like
12 we list it in Bugzilla.
13
14 pym/gentoolkit/eshowkw/keywords_header.py | 2 +-
15 1 file changed, 1 insertion(+), 1 deletion(-)
16
17 diff --git a/pym/gentoolkit/eshowkw/keywords_header.py b/pym/gentoolkit/eshowkw/keywords_header.py
18 index 86e9bc5..9eedbcf 100644
19 --- a/pym/gentoolkit/eshowkw/keywords_header.py
20 +++ b/pym/gentoolkit/eshowkw/keywords_header.py
21 @@ -129,7 +129,7 @@ class keywords_header:
22 levels[kw] = level
23 break
24
25 - normal.sort(key=lambda kw: (levels.get(kw, 99), kw))
26 + normal.sort(key=lambda kw: (levels.get(kw, 99), kw.count('-'), kw))
27 return normal
28
29 def __readAdditionalFields(self):