[gentoo-commits] portage r15328 - main/trunk/pym/portage

[Zac Medico (zmedico)]

Author: zmedico
Date: 2010-02-09 03:20:45 +0000 (Tue, 09 Feb 2010)
New Revision: 15328

Modified:
   main/trunk/pym/portage/glsa.py
Log:
Make Glsa constructor raise GlsaFormatException when a package name attribute
is invalid.


Modified: main/trunk/pym/portage/glsa.py
===================================================================
--- main/trunk/pym/portage/glsa.py	2010-02-09 03:02:40 UTC (rev 15327)
+++ main/trunk/pym/portage/glsa.py	2010-02-09 03:20:45 UTC (rev 15328)
@@ -11,6 +11,7 @@
 import re
 import xml.dom.minidom
 
+import portage
 from portage import os
 from portage import _encodings
 from portage import _unicode_decode
@@ -551,6 +552,13 @@
 		self.packages = {}
 		for p in self.affected.getElementsByTagName("package"):
 			name = p.getAttribute("name")
+			try:
+				name = portage.dep.Atom(name)
+			except portage.exception.InvalidAtom:
+				raise GlsaFormatException(_("invalid package name: %s") % name)
+			if name != name.cp:
+				raise GlsaFormatException(_("invalid package name: %s") % name)
+			name = name.cp
 			if name not in self.packages:
 				self.packages[name] = []
 			tmp = {}