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 CEFC2138222 for ; Tue, 3 May 2016 09:33:47 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 2160D21C02F; Tue, 3 May 2016 09:33:46 +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 42D9421C017 for ; Tue, 3 May 2016 09:33:45 +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 695A7340B98 for ; Tue, 3 May 2016 09:33:44 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id 3F2A9345 for ; Tue, 3 May 2016 09:33:40 +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: <1462266775.6ca71f4c66e45d86503f1cc199e1547e19b35a2e.dolsen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/modules/scan/metadata/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/modules/scan/metadata/pkgmetadata.py X-VCS-Directories: pym/repoman/modules/scan/metadata/ X-VCS-Committer: dolsen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 6ca71f4c66e45d86503f1cc199e1547e19b35a2e X-VCS-Branch: repoman Date: Tue, 3 May 2016 09:33:40 +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: 3c99b71f-e38f-4fd2-8f52-1ea1cb574481 X-Archives-Hash: b9e070951b2073f1f3e0b0b70338229a commit: 6ca71f4c66e45d86503f1cc199e1547e19b35a2e Author: Brian Dolbec gentoo org> AuthorDate: Tue May 3 07:39:09 2016 +0000 Commit: Brian Dolbec gentoo 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 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):