commit: 1a7f870b68741331f69b07e8227685e70c964202
Author: Michał Górny <mgorny <AT> gentoo <DOT> org>
AuthorDate: Tue Jan 23 12:11:13 2018 +0000
Commit: Michał Górny <mgorny <AT> gentoo <DOT> org>
CommitDate: Fri Jan 26 14:50:47 2018 +0000
URL: https://gitweb.gentoo.org/proj/gentoolkit.git/commit/?id=1a7f870b
eshowkw: Split Prefix keyword test into separate function
pym/gentoolkit/eshowkw/keywords_header.py | 11 +++++++----
1 file changed, 7 insertions(+), 4 deletions(-)
diff --git a/pym/gentoolkit/eshowkw/keywords_header.py
b/pym/gentoolkit/eshowkw/keywords_header.py
index 9c6538c..9b00d17 100644
--- a/pym/gentoolkit/eshowkw/keywords_header.py
+++ b/pym/gentoolkit/eshowkw/keywords_header.py
@@ -1,5 +1,5 @@
# vim:fileencoding=utf-8
-# Copyright 2001-2010 Gentoo Foundation
+# Copyright 2001-2018 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
__all__ = ['keywords_header']
@@ -97,6 +97,10 @@ class keywords_header:
return [x for x in ports.archlist()
if not x.startswith('~')]
+ @staticmethod
+ def __isPrefix(k):
+ return len(k.split('-')) != 1
+
def __sortKeywords(self, keywords, prefix = False, required_keywords =
[]):
"""Sort keywords: order by status (IMP, then DEV, then EXP, then
prefix), then by name."""
@@ -109,10 +113,9 @@ class keywords_header:
if len(tmpkeywords) != 0:
keywords = tmpkeywords
- normal = [k for k in keywords if len(k.split('-')) == 1]
+ normal = [k for k in keywords if not self.__isPrefix(k)]
if prefix:
- longer = [k for k in keywords
- if len(k.split('-')) != 1]
+ longer = [k for k in keywords if self.__isPrefix(k)]
longer.sort()
normal.extend(longer)
