From: Zac Medico <zmedico@gentoo.org>
Date: Sun, 3 Jul 2011 15:52:37 +0000 (-0700)
Subject: repoman: ElementTree.ParseError -> SyntaxError
X-Git-Tag: v2.1.10.4~3
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=816e20deb9320f98019d4553488c231e7ed2f5ec;p=portage.git

repoman: ElementTree.ParseError -> SyntaxError

The ElementTree.ParseError class is undocumented and isn't available
in python-2.6, so use its SyntaxError base class instead.
---

diff --git a/bin/repoman b/bin/repoman
index 0e3820fae..d1d393a82 100755
--- a/bin/repoman
+++ b/bin/repoman
@@ -1404,7 +1404,7 @@ for x in scanlist:
 				os.path.join(checkdir, "metadata.xml"),
 				parser=xml.etree.ElementTree.XMLParser(
 					target=_MetadataTreeBuilder()))
-		except (xml.etree.ElementTree.ParseError, ExpatError, EnvironmentError) as e:
+		except (ExpatError, SyntaxError, EnvironmentError) as e:
 			metadata_bad = True
 			stats["metadata.bad"] += 1
 			fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e))