From 14522d53c0088a0087376366f2b09c32704e791d Mon Sep 17 00:00:00 2001 From: Mike Frysinger Date: Mon, 20 Jan 2014 01:15:33 -0500 Subject: ekeyword: make sure ~all does not expand into entire arch list --- src/ekeyword/ekeyword.py | 2 +- src/ekeyword/ekeyword_unittest.py | 3 +++ 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/src/ekeyword/ekeyword.py b/src/ekeyword/ekeyword.py index 37a25ee..b53daef 100755 --- a/src/ekeyword/ekeyword.py +++ b/src/ekeyword/ekeyword.py @@ -146,7 +146,7 @@ def process_keywords(keywords, ops, arch_status=None): # Process all possible keywords. We use the arch_status as a # master list. If it lacks some keywords, then we might miss # somethings here, but not much we can do. - arches = set(arch_status.keys()) | old_arches + arches = old_arches else: arches = (oarch,) diff --git a/src/ekeyword/ekeyword_unittest.py b/src/ekeyword/ekeyword_unittest.py index 9ccde0e..a1d8d85 100755 --- a/src/ekeyword/ekeyword_unittest.py +++ b/src/ekeyword/ekeyword_unittest.py @@ -169,6 +169,9 @@ class TestProcessKeywords(unittest.TestCase): 'arm': 'stable', 'arm64': 'exp', 'm68k': 'dev', + 'mips': 'dev', + 's390': 'dev', + 'sh': 'dev', } self._test('alpha arm arm64 m68k mips arm-linux', ops, '~alpha ~arm ~arm64 ~m68k ~mips ~arm-linux', arch_status) -- cgit v1.2.3-18-g5258