commit: 062684bf8febc88891fa7611e99712e2b67ddbc8
Author: Göktürk Yüksek <gokturk <AT> binghamton <DOT> edu>
AuthorDate: Sun Mar 6 09:16:56 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> 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 <gokturk <AT> 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"
