summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichał Górny <gentoo@mgorny.alt.pl>2010-04-17 12:26:49 +0000
committerZac Medico <zmedico@gentoo.org>2010-04-24 00:59:34 -0700
commit6994173a25dba6a0ccd0242d6471882992453913 (patch)
treedc2641b88d2e8e9efd4734ac3144b76a8f2aacaa /bin/repoman
parentQuote path for die snippet display. (diff)
downloadportage-idfetch-6994173a25dba6a0ccd0242d6471882992453913.tar.gz
portage-idfetch-6994173a25dba6a0ccd0242d6471882992453913.tar.bz2
portage-idfetch-6994173a25dba6a0ccd0242d6471882992453913.zip
Make metadata.xml <flag/> errors non-fatal to repoman.
Previously, <flag/>-related errors in metadata.xml caused repoman to abort the checks without even reporting the full path to broken metadata.xml file. Now they are accounted as 'metadata.bad' errors.
Diffstat (limited to 'bin/repoman')
-rwxr-xr-xbin/repoman8
1 files changed, 7 insertions, 1 deletions
diff --git a/bin/repoman b/bin/repoman
index 23fcd4da..aa3a9526 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1314,7 +1314,13 @@ for x in scanlist:
del e
else:
# load USE flags from metadata.xml
- utilities.parse_metadata_use(_metadata_xml, muselist)
+ try:
+ utilities.parse_metadata_use(_metadata_xml, muselist)
+ except portage.exception.ParseError as e:
+ metadata_bad = True
+ stats["metadata.bad"] += 1
+ fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e))
+ muselist = []
# Run other metadata.xml checkers
try: