Gentoo Archives: gentoo-commits

From: "Marius Mauch (genone)" <genone@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] portage r11589 - main/trunk/pym/portage
Date: Sun, 28 Sep 2008 18:42:00
Message-Id: E1Kk1DR-0000nd-84@stork.gentoo.org
1 Author: genone
2 Date: 2008-09-28 18:41:56 +0000 (Sun, 28 Sep 2008)
3 New Revision: 11589
4
5 Modified:
6 main/trunk/pym/portage/glsa.py
7 Log:
8 also accept glsa-2.dtd as valid for GLSAs (patch by Robert Buchholz <rbu@g.o>)
9
10 Modified: main/trunk/pym/portage/glsa.py
11 ===================================================================
12 --- main/trunk/pym/portage/glsa.py 2008-09-28 18:39:44 UTC (rev 11588)
13 +++ main/trunk/pym/portage/glsa.py 2008-09-28 18:41:56 UTC (rev 11589)
14 @@ -432,7 +432,11 @@
15 self.DOM = xml.dom.minidom.parse(myfile)
16 if not self.DOM.doctype:
17 raise GlsaTypeException(None)
18 - elif self.DOM.doctype.systemId != "http://www.gentoo.org/dtd/glsa.dtd":
19 + elif self.DOM.doctype.systemId == "http://www.gentoo.org/dtd/glsa.dtd":
20 + self.dtdversion = 0
21 + elif self.DOM.doctype.systemId == "http://www.gentoo.org/dtd/glsa-2.dtd":
22 + self.dtdversion = 2
23 + else:
24 raise GlsaTypeException(self.DOM.doctype.systemId)
25 myroot = self.DOM.getElementsByTagName("glsa")[0]
26 if self.type == "id" and myroot.getAttribute("id") != self.nr: