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 <gentoo-commits+bounces-145114-garchives=archives.gentoo.org@lists.gentoo.org>)
	id 1M2Bcl-0004X0-3z
	for garchives@archives.gentoo.org; Thu, 07 May 2009 21:59:27 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 8F0ECE032D;
	Thu,  7 May 2009 21:59:26 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
	by pigeon.gentoo.org (Postfix) with ESMTP id 6AA16E032D
	for <gentoo-commits@lists.gentoo.org>; Thu,  7 May 2009 21:59:26 +0000 (UTC)
Received: from stork.gentoo.org (stork.gentoo.org [64.127.104.133])
	(using TLSv1 with cipher AES256-SHA (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTP id 4ED2C656F4
	for <gentoo-commits@lists.gentoo.org>; Thu,  7 May 2009 21:59:26 +0000 (UTC)
Received: from fuzzyray by stork.gentoo.org with local (Exim 4.69)
	(envelope-from <fuzzyray@stork.gentoo.org>)
	id 1M2Bcj-0007KY-Ov
	for gentoo-commits@lists.gentoo.org; Thu, 07 May 2009 21:59:25 +0000
To: gentoo-commits@lists.gentoo.org
From: "Paul Varner (fuzzyray)" <fuzzyray@gentoo.org>
Subject: [gentoo-commits] gentoolkit r627 - trunk/gentoolkit/pym/gentoolkit/glsa
X-VCS-Repository: gentoolkit
X-VCS-Revision: 627
X-VCS-Files: trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py
X-VCS-Directories: trunk/gentoolkit/pym/gentoolkit/glsa
X-VCS-Committer: fuzzyray
X-VCS-Committer-Name: Paul Varner
Content-Type: text/plain; charset=UTF-8
Message-Id: <E1M2Bcj-0007KY-Ov@stork.gentoo.org>
Sender: Paul Varner <fuzzyray@stork.gentoo.org>
Date: Thu, 07 May 2009 21:59:25 +0000
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt: 1c44d779-4b88-4f49-815c-c0ebe8557d36
X-Archives-Hash: 864749fc9f7a0d2ced5dde97a2729a91

Author: fuzzyray
Date: 2009-05-07 21:59:25 +0000 (Thu, 07 May 2009)
New Revision: 627

Modified:
   trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py
Log:
Add patch from Robert Buchholz: Allow GLSA 2 DTD in doctype declaration

Modified: trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py	2009-05-07 21:58:49 =
UTC (rev 626)
+++ trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py	2009-05-07 21:59:25 =
UTC (rev 627)
@@ -470,7 +470,11 @@
 		self.DOM =3D xml.dom.minidom.parse(myfile)
 		if not self.DOM.doctype:
 			raise GlsaTypeException(None)
-		elif self.DOM.doctype.systemId !=3D "http://www.gentoo.org/dtd/glsa.dt=
d":
+		elif self.DOM.doctype.systemId =3D=3D "http://www.gentoo.org/dtd/glsa.=
dtd":
+			self.dtdversion =3D 0
+		elif self.DOM.doctype.systemId =3D=3D "http://www.gentoo.org/dtd/glsa-=
2.dtd":
+			self.dtdversion =3D 2
+		else:
 			raise GlsaTypeException(self.DOM.doctype.systemId)
 		myroot =3D self.DOM.getElementsByTagName("glsa")[0]
 		if self.type =3D=3D "id" and myroot.getAttribute("id") !=3D self.nr: