commit: 57ad076b08d417bf5d2642131b76392a990f3c35
Author: Dirkjan Ochtman <dirkjan <AT> ochtman <DOT> nl>
AuthorDate: Mon Jan 25 19:45:31 2016 +0000
Commit: Brian Dolbec <dolsen <AT> gentoo <DOT> org>
CommitDate: Tue May 3 06:55:53 2016 +0000
URL: https://gitweb.gentoo.org/proj/portage.git/commit/?id=57ad076b
repoman: mandate use of python 2.7 or 3.2+ for simplicity
pym/repoman/modules/scan/metadata/pkgmetadata.py | 78 +++++++++++-------------
1 file changed, 36 insertions(+), 42 deletions(-)
diff --git a/pym/repoman/modules/scan/metadata/pkgmetadata.py
b/pym/repoman/modules/scan/metadata/pkgmetadata.py
index cde2ba0..e8db92f 100644
--- a/pym/repoman/modules/scan/metadata/pkgmetadata.py
+++ b/pym/repoman/modules/scan/metadata/pkgmetadata.py
@@ -158,54 +158,48 @@ class PkgMetadata(ScanBase, USEFlagChecks):
self.muselist = frozenset(self.musedict)
return False
- if not hasattr(xml_parser, 'parser') or \
- sys.hexversion < 0x2070000 or \
- (sys.hexversion > 0x3000000 and sys.hexversion <
0x3020000):
- # doctype is not parsed with python 2.6 or 3.1
- pass
+ if "XML_DECLARATION" not in xml_info:
+ self.qatracker.add_error(
+ "metadata.bad", "%s/metadata.xml: "
+ "xml declaration is missing on first line, "
+ "should be '%s'" % (xpkg,
metadata_xml_declaration))
else:
- if "XML_DECLARATION" not in xml_info:
+ xml_version, xml_encoding, xml_standalone = \
+ xml_info["XML_DECLARATION"]
+ if xml_encoding is None or \
+ xml_encoding.upper() != metadata_xml_encoding:
+ if xml_encoding is None:
+ encoding_problem = "but it is undefined"
+ else:
+ encoding_problem = "not '%s'" %
xml_encoding
self.qatracker.add_error(
"metadata.bad", "%s/metadata.xml: "
- "xml declaration is missing on first
line, "
- "should be '%s'" % (xpkg,
metadata_xml_declaration))
- else:
- xml_version, xml_encoding, xml_standalone = \
- xml_info["XML_DECLARATION"]
- if xml_encoding is None or \
- xml_encoding.upper() !=
metadata_xml_encoding:
- if xml_encoding is None:
- encoding_problem = "but it is
undefined"
- else:
- encoding_problem = "not '%s'" %
xml_encoding
- self.qatracker.add_error(
- "metadata.bad",
"%s/metadata.xml: "
- "xml declaration encoding
should be '%s', %s" %
- (xpkg, metadata_xml_encoding,
encoding_problem))
+ "xml declaration encoding should be
'%s', %s" %
+ (xpkg, metadata_xml_encoding,
encoding_problem))
- if "DOCTYPE" not in xml_info:
- metadata_bad = True
+ if "DOCTYPE" not in xml_info:
+ metadata_bad = True
+ self.qatracker.add_error(
+ "metadata.bad",
+ "%s/metadata.xml: %s" % (xpkg, "DOCTYPE is
missing"))
+ else:
+ doctype_name, doctype_system, doctype_pubid = \
+ xml_info["DOCTYPE"]
+ if doctype_system != metadata_dtd_uri:
+ if doctype_system is None:
+ system_problem = "but it is undefined"
+ else:
+ system_problem = "not '%s'" %
doctype_system
self.qatracker.add_error(
- "metadata.bad",
- "%s/metadata.xml: %s" % (xpkg, "DOCTYPE
is missing"))
- else:
- doctype_name, doctype_system, doctype_pubid = \
- xml_info["DOCTYPE"]
- if doctype_system != metadata_dtd_uri:
- if doctype_system is None:
- system_problem = "but it is
undefined"
- else:
- system_problem = "not '%s'" %
doctype_system
- self.qatracker.add_error(
- "metadata.bad",
"%s/metadata.xml: "
- "DOCTYPE: SYSTEM should refer
to '%s', %s" %
- (xpkg, metadata_dtd_uri,
system_problem))
+ "metadata.bad", "%s/metadata.xml: "
+ "DOCTYPE: SYSTEM should refer to '%s',
%s" %
+ (xpkg, metadata_dtd_uri,
system_problem))
- if doctype_name != metadata_doctype_name:
- self.qatracker.add_error(
- "metadata.bad",
"%s/metadata.xml: "
- "DOCTYPE: name should be '%s',
not '%s'" %
- (xpkg, metadata_doctype_name,
doctype_name))
+ if doctype_name != metadata_doctype_name:
+ self.qatracker.add_error(
+ "metadata.bad", "%s/metadata.xml: "
+ "DOCTYPE: name should be '%s', not
'%s'" %
+ (xpkg, metadata_doctype_name,
doctype_name))
# load USE flags from metadata.xml
try:
