From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org) by finch.gentoo.org with esmtp (Exim 4.60) (envelope-from ) id 1QdSMz-0004Xc-7u for garchives@archives.gentoo.org; Sun, 03 Jul 2011 19:30:17 +0000 Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 9179A21C04A; Sun, 3 Jul 2011 19:30:05 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 8E36B21C037 for ; Sun, 3 Jul 2011 19:30:04 +0000 (UTC) Received: from pelican.gentoo.org (unknown [66.219.59.40]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id A9C962AC108 for ; Sun, 3 Jul 2011 15:53:01 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by pelican.gentoo.org (Postfix) with ESMTP id 154C38003D for ; Sun, 3 Jul 2011 15:53:01 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <816e20deb9320f98019d4553488c231e7ed2f5ec.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/ X-VCS-Repository: proj/portage X-VCS-Files: bin/repoman X-VCS-Directories: bin/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 816e20deb9320f98019d4553488c231e7ed2f5ec Date: Sun, 3 Jul 2011 15:53:01 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: quoted-printable X-Archives-Salt: X-Archives-Hash: a0a038f0321c99a89b043238332f5a15 commit: 816e20deb9320f98019d4553488c231e7ed2f5ec Author: Zac Medico gentoo org> AuthorDate: Sun Jul 3 15:52:37 2011 +0000 Commit: Zac Medico gentoo org> CommitDate: Sun Jul 3 15:52:37 2011 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=3Dproj/portage.git;a= =3Dcommit;h=3D816e20de 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. --- bin/repoman | 2 +- 1 files changed, 1 insertions(+), 1 deletions(-) diff --git a/bin/repoman b/bin/repoman index 0e3820f..d1d393a 100755 --- a/bin/repoman +++ b/bin/repoman @@ -1404,7 +1404,7 @@ for x in scanlist: os.path.join(checkdir, "metadata.xml"), parser=3Dxml.etree.ElementTree.XMLParser( target=3D_MetadataTreeBuilder())) - except (xml.etree.ElementTree.ParseError, ExpatError, EnvironmentError= ) as e: + except (ExpatError, SyntaxError, EnvironmentError) as e: metadata_bad =3D True stats["metadata.bad"] +=3D 1 fails["metadata.bad"].append("%s/metadata.xml: %s" % (x, e))