summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2008-09-28 18:41:56 +0000
committerMarius Mauch <genone@gentoo.org>2008-09-28 18:41:56 +0000
commit645ac02ee03e54f797c20594755db0f80873ee55 (patch)
treef3f42e8bc93dfe4623a3f18aa576a13075203b64
parent10f0641ffb3de3b02a511f5a50a6d1941e1b467e (diff)
downloadportage-645ac02ee03e54f797c20594755db0f80873ee55.tar.gz
portage-645ac02ee03e54f797c20594755db0f80873ee55.tar.bz2
portage-645ac02ee03e54f797c20594755db0f80873ee55.zip
also accept glsa-2.dtd as valid for GLSAs (patch by Robert Buchholz <rbu@gentoo.org>)
svn path=/main/trunk/; revision=11589
-rw-r--r--pym/portage/glsa.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py
index 09bc343e6..b7f0c953e 100644
--- 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: