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 3154459CA3 for ; Sun, 6 Mar 2016 18:05:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 4FF0121C0D4; Sun, 6 Mar 2016 18:05:20 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id A1D0F21C0D4 for ; Sun, 6 Mar 2016 18:05:19 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id B63B63408DD for ; Sun, 6 Mar 2016 18:05:18 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 2471F18A5 for ; Sun, 6 Mar 2016 18:05:17 +0000 (UTC) From: "Brian Dolbec" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Dolbec" Message-ID: <1457287025.062684bf8febc88891fa7611e99712e2b67ddbc8.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/portageq X-VCS-Directories: bin/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 062684bf8febc88891fa7611e99712e2b67ddbc8 X-VCS-Branch: master Date: Sun, 6 Mar 2016 18:05:17 +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: a56358a9-fa17-4f02-9bef-ae8a9cc47d0f X-Archives-Hash: 6dc13b64b983477d0cec918ad2b09b80 commit: 062684bf8febc88891fa7611e99712e2b67ddbc8 Author: Göktürk Yüksek binghamton edu> AuthorDate: Sun Mar 6 09:16:56 2016 +0000 Commit: Brian Dolbec gentoo org> CommitDate: Sun Mar 6 17:57:05 2016 +0000 URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=062684bf bin/portageq: remove the herd matcher per GLEP 67 Herds are obsolete per GLEP 67. Projects can be matched using the project's email address just like any other maintainer. Signed-off-by: Göktürk Yüksek binghamton.edu> bin/portageq | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/bin/portageq b/bin/portageq index 44eea2b..07d3c49 100755 --- a/bin/portageq +++ b/bin/portageq @@ -1020,14 +1020,6 @@ class MaintainerEmailMatcher(object): break return match -class HerdMatcher(object): - def __init__(self, herds): - self._herds = frozenset(herds) - - def __call__(self, metadata_xml): - herds = self._herds - return any(x in herds for x in metadata_xml.herds()) - # Match if metadata.xml contains no maintainer (orphaned package) def match_orphaned(metadata_xml): if not metadata_xml.maintainers(): @@ -1091,11 +1083,6 @@ def pquery(parser, opts, args): for x in opts.maintainer_email: maintainer_emails.extend(x.split(",")) xml_matchers.append(MaintainerEmailMatcher(maintainer_emails)) - if opts.herd is not None: - herds = [] - for x in opts.herd: - herds.extend(x.split(",")) - xml_matchers.append(HerdMatcher(herds)) if opts.orphaned: xml_matchers.append(match_orphaned) @@ -1248,11 +1235,6 @@ def add_pquery_arguments(parser): 'Package matching options', ( { - "longopt": "--herd", - "action": "append", - "help": "exact match on a herd" - }, - { "longopt": "--maintainer-email", "action": "append", "help": "comma-separated list of maintainer email regexes to search for"