From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id DACDF138A1F for ; Mon, 27 Jan 2014 23:14:44 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 93A12E0C56; Mon, 27 Jan 2014 23:14:42 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 22734E0C56 for ; Mon, 27 Jan 2014 23:14:42 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 0D01433F5F5 for ; Mon, 27 Jan 2014 23:14:41 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B731F18096 for ; Mon, 27 Jan 2014 23:14:39 +0000 (UTC) From: "Mike Frysinger" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Mike Frysinger" Message-ID: <1390864423.465c0532f88df7bf3af08e84172ea5a908105fc1.vapier@gentoo> Subject: [gentoo-commits] proj/gentoolkit:gentoolkit-dev commit in: src/ekeyword/ X-VCS-Repository: proj/gentoolkit X-VCS-Files: src/ekeyword/ekeyword.py src/ekeyword/ekeyword_unittest.py X-VCS-Directories: src/ekeyword/ X-VCS-Committer: vapier X-VCS-Committer-Name: Mike Frysinger X-VCS-Revision: 465c0532f88df7bf3af08e84172ea5a908105fc1 X-VCS-Branch: gentoolkit-dev Date: Mon, 27 Jan 2014 23:14:39 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 3094e9b9-15c3-4723-84bb-810adcea7b81 X-Archives-Hash: fcd969226e12d4f215ec936a7a92abec commit: 465c0532f88df7bf3af08e84172ea5a908105fc1 Author: Mike Frysinger gentoo org> AuthorDate: Mon Jan 27 23:13:43 2014 +0000 Commit: Mike Frysinger gentoo org> CommitDate: Mon Jan 27 23:13:43 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/gentoolkit.git;a=commit;h=465c0532 ekeyword: ignore "*" when processing "all" Reported-by: Jeroen Roovers gentoo.org> --- src/ekeyword/ekeyword.py | 3 +++ src/ekeyword/ekeyword_unittest.py | 9 ++++----- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/src/ekeyword/ekeyword.py b/src/ekeyword/ekeyword.py index 3fa74c1..080e04f 100755 --- a/src/ekeyword/ekeyword.py +++ b/src/ekeyword/ekeyword.py @@ -151,6 +151,9 @@ def process_keywords(keywords, ops, arch_status=None): # master list. If it lacks some keywords, then we might miss # somethings here, but not much we can do. arches = old_arches + # We ignore the glob arch as we never want to tweak it. + if '*' in arches: + arches.remove('*') else: arches = (oarch,) diff --git a/src/ekeyword/ekeyword_unittest.py b/src/ekeyword/ekeyword_unittest.py index 00c295f..b491db0 100755 --- a/src/ekeyword/ekeyword_unittest.py +++ b/src/ekeyword/ekeyword_unittest.py @@ -176,12 +176,11 @@ 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) + self._test('-* ~* * alpha arm arm64 m68k arm-linux', ops, + '-* ~* * ~alpha ~arm ~arm64 ~m68k ~arm-linux', arch_status) def testAllMultiUnstableStable(self): ops = ( @@ -194,8 +193,8 @@ class TestProcessKeywords(unittest.TestCase): 'arm64': 'exp', 'm68k': 'dev', } - self._test('alpha arm arm64 m68k', ops, - '~alpha arm ~arm64 ~m68k', arch_status) + self._test('-* ~* * alpha arm arm64 m68k', ops, + '-* ~* * ~alpha arm ~arm64 ~m68k', arch_status) class TestProcessContent(unittest.TestCase):