commit: 1a270403eb361c287a09be622242f4d3ae316c4f
Author: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
AuthorDate: Mon Jun 2 01:06:33 2014 +0000
Commit: Brian Dolbec <brian.dolbec <AT> gmail <DOT> 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")
