| 1 |
commit: 6ca71f4c66e45d86503f1cc199e1547e19b35a2e |
| 2 |
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 3 |
AuthorDate: Tue May 3 07:39:09 2016 +0000 |
| 4 |
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org> |
| 5 |
CommitDate: Tue May 3 09:12:55 2016 +0000 |
| 6 |
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=6ca71f4c |
| 7 |
|
| 8 |
repoman/modules/.../pkgmetadata.py: Remove obsolete herds checks |
| 9 |
|
| 10 |
This change based on original work done by Dirkjan Ochtman <dirkjan <AT> ochtman.nl> |
| 11 |
|
| 12 |
pym/repoman/modules/scan/metadata/pkgmetadata.py | 12 ------------ |
| 13 |
1 file changed, 12 deletions(-) |
| 14 |
|
| 15 |
diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py b/pym/repoman/modules/scan/metadata/pkgmetadata.py |
| 16 |
index 22afddf..c744c13 100644 |
| 17 |
--- a/pym/repoman/modules/scan/metadata/pkgmetadata.py |
| 18 |
+++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py |
| 19 |
@@ -24,8 +24,6 @@ except (ImportError, SystemError, RuntimeError, Exception): |
| 20 |
# import our initialized portage instance |
| 21 |
from repoman._portage import portage |
| 22 |
from repoman.metadata import metadata_dtd_uri |
| 23 |
-from repoman.checks.herds.herdbase import get_herd_base |
| 24 |
-from repoman.checks.herds.metadata import check_metadata, UnknownHerdsError |
| 25 |
from repoman._xml import XmlLint |
| 26 |
from repoman.modules.scan.scanbase import ScanBase |
| 27 |
|
| 28 |
@@ -205,16 +203,6 @@ class PkgMetadata(ScanBase, USEFlagChecks): |
| 29 |
"%s/metadata.xml: Atom contains " |
| 30 |
"unexpected cat/pn: %s" % (xpkg, atom)) |
| 31 |
|
| 32 |
- # Run other metadata.xml checkers |
| 33 |
- try: |
| 34 |
- check_metadata(_metadata_xml, get_herd_base( |
| 35 |
- self.repoman_settings)) |
| 36 |
- except (UnknownHerdsError, ) as e: |
| 37 |
- metadata_bad = True |
| 38 |
- self.qatracker.add_error( |
| 39 |
- "metadata.bad", "%s/metadata.xml: %s" % (xpkg, e)) |
| 40 |
- del e |
| 41 |
- |
| 42 |
# Only carry out if in package directory or check forced |
| 43 |
if not metadata_bad: |
| 44 |
if not self.xmllint.check(checkdir, repolevel): |
Archives