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 4E82E1381FA for ; Mon, 2 Jun 2014 01:10:53 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id EF0E9E09BA; Mon, 2 Jun 2014 01:10:51 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 4B281E09BA for ; Mon, 2 Jun 2014 01:10:51 +0000 (UTC) Received: from spoonbill.gentoo.org (spoonbill.gentoo.org [81.93.255.5]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 385FB33FF91 for ; Mon, 2 Jun 2014 01:10:50 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by spoonbill.gentoo.org (Postfix) with ESMTP id B9991182D5 for ; Mon, 2 Jun 2014 01:10:48 +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: <1401671297.1a270403eb361c287a09be622242f4d3ae316c4f.dol-sen@gentoo> Subject: [gentoo-commits] proj/portage:repoman commit in: pym/repoman/ X-VCS-Repository: proj/portage X-VCS-Files: pym/repoman/_xml.py pym/repoman/main.py X-VCS-Directories: pym/repoman/ X-VCS-Committer: dol-sen X-VCS-Committer-Name: Brian Dolbec X-VCS-Revision: 1a270403eb361c287a09be622242f4d3ae316c4f X-VCS-Branch: repoman Date: Mon, 2 Jun 2014 01:10:48 +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: 391ade12-4c73-4dae-9e9f-37bb71166c6f X-Archives-Hash: 00bdba095a55c7aa209b282ea65c610a commit: 1a270403eb361c287a09be622242f4d3ae316c4f Author: Brian Dolbec gentoo org> AuthorDate: Mon Jun 2 01:06:33 2014 +0000 Commit: Brian Dolbec gmail com> CommitDate: Mon Jun 2 01:08:17 2014 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=1a270403 Repoman: Optimize, consolidate some XmlLint class useage --- pym/repoman/_xml.py | 4 ++-- pym/repoman/main.py | 7 +------ 2 files changed, 3 insertions(+), 8 deletions(-) diff --git a/pym/repoman/_xml.py b/pym/repoman/_xml.py index 1b98ede..513b62a 100644 --- a/pym/repoman/_xml.py +++ b/pym/repoman/_xml.py @@ -47,8 +47,8 @@ class _MetadataTreeBuilder(xml.etree.ElementTree.TreeBuilder): class XmlLint(object): - def __init__(self, metadata_dtd, options, repolevel, repoman_settings): - self.metadata_dtd = metadata_dtd + def __init__(self, options, repolevel, repoman_settings): + self.metadata_dtd = os.path.join(repoman_settings["DISTDIR"], 'metadata.dtd') self._is_capable = False self.binary = None self._check_capable(options, repolevel, repoman_settings) diff --git a/pym/repoman/main.py b/pym/repoman/main.py index f8bd264..af7c52b 100755 --- a/pym/repoman/main.py +++ b/pym/repoman/main.py @@ -259,12 +259,6 @@ dev_keywords = dev_keywords(profiles) qatracker = QATracker() -#################### - -metadata_dtd = os.path.join(repoman_settings["DISTDIR"], 'metadata.dtd') -xmllint = XmlLint(metadata_dtd, options, repolevel, repoman_settings) - -##################### if options.mode == "manifest": pass @@ -607,6 +601,7 @@ for xpkg in effective_scanlist: ################# # Only carry out if in package directory or check forced if not metadata_bad: + xmllint = XmlLint(options, repolevel, repoman_settings) if not xmllint.check(checkdir): qatracker.add_error("metadata.bad", xpkg + "/metadata.xml")