Gentoo Archives: gentoo-commits

From: Zac Medico <zmedico@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] proj/portage:master commit in: bin/
Date: Sun, 03 Jul 2011 19:30:17
Message-Id: 816e20deb9320f98019d4553488c231e7ed2f5ec.zmedico@gentoo
1 commit: 816e20deb9320f98019d4553488c231e7ed2f5ec
2 Author: Zac Medico <zmedico <AT> gentoo <DOT> org>
3 AuthorDate: Sun Jul 3 15:52:37 2011 +0000
4 Commit: Zac Medico <zmedico <AT> gentoo <DOT> org>
5 CommitDate: Sun Jul 3 15:52:37 2011 +0000
6 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=816e20de
7
8 repoman: ElementTree.ParseError -> SyntaxError
9
10 The ElementTree.ParseError class is undocumented and isn't available
11 in python-2.6, so use its SyntaxError base class instead.
12
13 ---
14 bin/repoman | 2 +-
15 1 files changed, 1 insertions(+), 1 deletions(-)
16
17 diff --git a/bin/repoman b/bin/repoman
18 index 0e3820f..d1d393a 100755
19 --- a/bin/repoman
20 +++ b/bin/repoman
21 @@ -1404,7 +1404,7 @@ for x in scanlist:
22 os.path.join(checkdir, "metadata.xml"),
23 parser=xml.etree.ElementTree.XMLParser(
24 target=_MetadataTreeBuilder()))
25 - except (xml.etree.ElementTree.ParseError, ExpatError, EnvironmentError) as e:
26 + except (ExpatError, SyntaxError, EnvironmentError) as e:
27 metadata_bad = True
28 stats["metadata.bad"] += 1
29 fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e))