also accept glsa-2.dtd as valid for GLSAs (patch by Robert Buchholz <rbu@gentoo.org>)

svn path=/main/trunk/; revision=11589

diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py
index 09bc343e699a0707fea2050071ccdfc605038780..b7f0c953e43e97e0ca36476bdeaee9011a7482df 100644 (file)
--- a/pym/portage/glsa.py
+++ b/pym/portage/glsa.py
@@ -432,7 +432,11 @@ class Glsa:
                self.DOM = xml.dom.minidom.parse(myfile)
                if not self.DOM.doctype:
                        raise GlsaTypeException(None)
-               elif self.DOM.doctype.systemId != "http://www.gentoo.org/dtd/glsa.dtd":
+               elif self.DOM.doctype.systemId == "http://www.gentoo.org/dtd/glsa.dtd":
+                       self.dtdversion = 0
+               elif self.DOM.doctype.systemId == "http://www.gentoo.org/dtd/glsa-2.dtd":
+                       self.dtdversion = 2
+               else:
                        raise GlsaTypeException(self.DOM.doctype.systemId)
                myroot = self.DOM.getElementsByTagName("glsa")[0]
                if self.type == "id" and myroot.getAttribute("id") != self.nr: