| 1 |
commit: 465c0532f88df7bf3af08e84172ea5a908105fc1 |
| 2 |
Author: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Mon Jan 27 23:13:43 2014 +0000 |
| 4 |
Commit: Mike Frysinger <vapier <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Mon Jan 27 23:13:43 2014 +0000 |
| 6 |
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=465c0532 |
| 7 |
|
| 8 |
ekeyword: ignore "*" when processing "all" |
| 9 |
|
| 10 |
Reported-by: Jeroen Roovers <jer <AT> gentoo.org> |
| 11 |
|
| 12 |
--- |
| 13 |
src/ekeyword/ekeyword.py | 3 +++ |
| 14 |
src/ekeyword/ekeyword_unittest.py | 9 ++++----- |
| 15 |
2 files changed, 7 insertions(+), 5 deletions(-) |
| 16 |
|
| 17 |
diff --git a/src/ekeyword/ekeyword.py b/src/ekeyword/ekeyword.py |
| 18 |
index 3fa74c1..080e04f 100755 |
| 19 |
--- a/src/ekeyword/ekeyword.py |
| 20 |
+++ b/src/ekeyword/ekeyword.py |
| 21 |
@@ -151,6 +151,9 @@ def process_keywords(keywords, ops, arch_status=None): |
| 22 |
# master list. If it lacks some keywords, then we might miss |
| 23 |
# somethings here, but not much we can do. |
| 24 |
arches = old_arches |
| 25 |
+ # We ignore the glob arch as we never want to tweak it. |
| 26 |
+ if '*' in arches: |
| 27 |
+ arches.remove('*') |
| 28 |
else: |
| 29 |
arches = (oarch,) |
| 30 |
|
| 31 |
|
| 32 |
diff --git a/src/ekeyword/ekeyword_unittest.py b/src/ekeyword/ekeyword_unittest.py |
| 33 |
index 00c295f..b491db0 100755 |
| 34 |
--- a/src/ekeyword/ekeyword_unittest.py |
| 35 |
+++ b/src/ekeyword/ekeyword_unittest.py |
| 36 |
@@ -176,12 +176,11 @@ class TestProcessKeywords(unittest.TestCase): |
| 37 |
'arm': 'stable', |
| 38 |
'arm64': 'exp', |
| 39 |
'm68k': 'dev', |
| 40 |
- 'mips': 'dev', |
| 41 |
's390': 'dev', |
| 42 |
'sh': 'dev', |
| 43 |
} |
| 44 |
- self._test('alpha arm arm64 m68k mips arm-linux', ops, |
| 45 |
- '~alpha ~arm ~arm64 ~m68k ~mips ~arm-linux', arch_status) |
| 46 |
+ self._test('-* ~* * alpha arm arm64 m68k arm-linux', ops, |
| 47 |
+ '-* ~* * ~alpha ~arm ~arm64 ~m68k ~arm-linux', arch_status) |
| 48 |
|
| 49 |
def testAllMultiUnstableStable(self): |
| 50 |
ops = ( |
| 51 |
@@ -194,8 +193,8 @@ class TestProcessKeywords(unittest.TestCase): |
| 52 |
'arm64': 'exp', |
| 53 |
'm68k': 'dev', |
| 54 |
} |
| 55 |
- self._test('alpha arm arm64 m68k', ops, |
| 56 |
- '~alpha arm ~arm64 ~m68k', arch_status) |
| 57 |
+ self._test('-* ~* * alpha arm arm64 m68k', ops, |
| 58 |
+ '-* ~* * ~alpha arm ~arm64 ~m68k', arch_status) |
| 59 |
|
| 60 |
|
| 61 |
class TestProcessContent(unittest.TestCase): |
Archives