diff options
| author |   Mike Frysinger <vapier@gentoo.org> | 2014-01-20 01:15:33 -0500 |
|---|---|---|
| committer | Mike Frysinger <vapier@gentoo.org> | 2014-01-20 01:15:33 -0500 |
| commit | 14522d53c0088a0087376366f2b09c32704e791d (patch) | |
| tree | 9b757c120bb005fb0ebf072f4b80cc3ca3826e87 | |
| parent | ekeyword: rewrite in python (diff) | |
| download | gentoolkit-14522d53c0088a0087376366f2b09c32704e791d.tar.gz gentoolkit-14522d53c0088a0087376366f2b09c32704e791d.tar.bz2 gentoolkit-14522d53c0088a0087376366f2b09c32704e791d.zip | |
ekeyword: make sure ~all does not expand into entire arch list
| -rwxr-xr-x | src/ekeyword/ekeyword.py | 2 | ||||
| -rwxr-xr-x | src/ekeyword/ekeyword_unittest.py | 3 |
2 files changed, 4 insertions, 1 deletions
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) |