Author: zmedico
Date: 2008-08-14 19:30:19 +0000 (Thu, 14 Aug 2008)
New Revision: 11410
Modified:
main/trunk/bin/repoman
Log:
Convert exceptions from parse_metadata_use() into "metadata.bad" errors
instead of exiting.
Modified: main/trunk/bin/repoman
===================================================================
--- main/trunk/bin/repoman 2008-08-14 19:25:26 UTC (rev 11409)
+++ main/trunk/bin/repoman 2008-08-14 19:30:19 UTC (rev 11410)
@@ -999,8 +999,21 @@
fails["metadata.missing"].append(x+"/metadata.xml")
#metadata.xml parse check
else:
+ metadata_bad = False
+
+ # load USE flags from metadata.xml
+ try:
+ f = open(os.path.join(checkdir, "metadata.xml"))
+ utilities.parse_metadata_use(f, muselist)
+ f.close()
+ except (EnvironmentError, ParseError), 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:
+ if xmllint_capable and not metadata_bad:
# xmlint can produce garbage output even on success, so only dump
# the ouput when it fails.
st, out = commands.getstatusoutput(
@@ -1013,14 +1026,7 @@
stats["metadata.bad"]+=1
fails["metadata.bad"].append(x+"/metadata.xml")
- #load USE flags from metadata.xml
- try:
- f = open(os.path.join(checkdir, "metadata.xml"))
- utilities.parse_metadata_use(f, muselist)
- f.close()
- except (EnvironmentError, ParseError), e:
- logging.exception("Couldn't read from metadata.xml")
- sys.exit(1)
+ del metadata_bad
allmasked = True
|
