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