| 1 |
commit: 062684bf8febc88891fa7611e99712e2b67ddbc8 |
| 2 |
Author: Göktürk Yüksek <gokturk <AT> binghamton <DOT> edu> |
| 3 |
AuthorDate: Sun Mar 6 09:16:56 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Sun Mar 6 17:57:05 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=062684bf |
| 7 |
|
| 8 |
bin/portageq: remove the herd matcher per GLEP 67 |
| 9 |
|
| 10 |
Herds are obsolete per GLEP 67. Projects can be matched using |
| 11 |
the project's email address just like any other maintainer. |
| 12 |
|
| 13 |
Signed-off-by: Göktürk Yüksek <gokturk <AT> binghamton.edu> |
| 14 |
|
| 15 |
bin/portageq | 18 ------------------ |
| 16 |
1 file changed, 18 deletions(-) |
| 17 |
|
| 18 |
diff --git a/bin/portageq b/bin/portageq |
| 19 |
index 44eea2b..07d3c49 100755 |
| 20 |
--- a/bin/portageq |
| 21 |
+++ b/bin/portageq |
| 22 |
@@ -1020,14 +1020,6 @@ class MaintainerEmailMatcher(object): |
| 23 |
break |
| 24 |
return match |
| 25 |
|
| 26 |
-class HerdMatcher(object): |
| 27 |
- def __init__(self, herds): |
| 28 |
- self._herds = frozenset(herds) |
| 29 |
- |
| 30 |
- def __call__(self, metadata_xml): |
| 31 |
- herds = self._herds |
| 32 |
- return any(x in herds for x in metadata_xml.herds()) |
| 33 |
- |
| 34 |
# Match if metadata.xml contains no maintainer (orphaned package) |
| 35 |
def match_orphaned(metadata_xml): |
| 36 |
if not metadata_xml.maintainers(): |
| 37 |
@@ -1091,11 +1083,6 @@ def pquery(parser, opts, args): |
| 38 |
for x in opts.maintainer_email: |
| 39 |
maintainer_emails.extend(x.split(",")) |
| 40 |
xml_matchers.append(MaintainerEmailMatcher(maintainer_emails)) |
| 41 |
- if opts.herd is not None: |
| 42 |
- herds = [] |
| 43 |
- for x in opts.herd: |
| 44 |
- herds.extend(x.split(",")) |
| 45 |
- xml_matchers.append(HerdMatcher(herds)) |
| 46 |
if opts.orphaned: |
| 47 |
xml_matchers.append(match_orphaned) |
| 48 |
|
| 49 |
@@ -1248,11 +1235,6 @@ def add_pquery_arguments(parser): |
| 50 |
'Package matching options', |
| 51 |
( |
| 52 |
{ |
| 53 |
- "longopt": "--herd", |
| 54 |
- "action": "append", |
| 55 |
- "help": "exact match on a herd" |
| 56 |
- }, |
| 57 |
- { |
| 58 |
"longopt": "--maintainer-email", |
| 59 |
"action": "append", |
| 60 |
"help": "comma-separated list of maintainer email regexes to search for" |
Archives