From 6ce970a6a2462fcc07d4b0b2551ffa0c7dd9b338 Mon Sep 17 00:00:00 2001
From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 14 Aug 2008 19:30:19 +0000
Subject: Convert exceptions from parse_metadata_use() into "metadata.bad"
 errors instead of exiting.

svn path=/main/trunk/; revision=11410
---
 bin/repoman | 24 +++++++++++++++---------
 1 file changed, 15 insertions(+), 9 deletions(-)

diff --git a/bin/repoman b/bin/repoman
index 18be8e5aa..932cf4c99 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -999,8 +999,21 @@ for x in scanlist:
 		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 @@ for x in scanlist:
 				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
 
-- 
cgit v1.2.3-1-g7c22