From 4866b8f1bc4cc4c089916ea5cd4b6d44691e8c6c Mon Sep 17 00:00:00 2001 From: Sebastian Pipping Date: Fri, 26 Feb 2010 22:10:43 +0100 Subject: Prepare further checks on metadata.xml --- bin/repoman | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) (limited to 'bin/repoman') diff --git a/bin/repoman b/bin/repoman index c96b18408..61a2c3359 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1296,16 +1296,25 @@ for x in scanlist: else: metadata_bad = False - # load USE flags from metadata.xml + # read metadata.xml into memory try: f = open(os.path.join(checkdir, "metadata.xml")) - utilities.parse_metadata_use(f, muselist) + _metadata_xml = f.read() f.close() - except (EnvironmentError, ParseError) as e: + except (EnvironmentError, ) as e: metadata_bad = True stats["metadata.bad"] += 1 fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e)) del e + else: + # load USE flags from metadata.xml + try: + utilities.parse_metadata_use(_metadata_xml, muselist) + except (EnvironmentError, ParseError) as e: + metadata_bad = True + stats["metadata.bad"] += 1 + fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e)) + del e #Only carry out if in package directory or check forced if xmllint_capable and not metadata_bad: -- cgit v1.2.3-1-g7c22