* All GLSA's have been converted to use the revision attribute
* Only check that the revision attribute is populated which defaults to 1 from
tooling (e.g. GLSAMaker)
* If there is no count attribute then raise a GlsaFormatException
* Remove 'try' logic as we already check if the attribute is populated
* We only check if the attribute is populated. Whether it is an int or not is
not a concern as it is only significant to security team.
Signed-off-by: Aaron Bauman <b...@gentoo.org>
---
lib/portage/glsa.py | 14 ++------------
1 file changed, 2 insertions(+), 12 deletions(-)
diff --git a/lib/portage/glsa.py b/lib/portage/glsa.py
index ccf93439d..f0ce34f3f 100644
--- a/lib/portage/glsa.py
+++ b/lib/portage/glsa.py
@@ -528,26 +528,16 @@ class Glsa:
self.synopsis =
getText(myroot.getElementsByTagName("synopsis")[0], format="strip")
self.announced =
format_date(getText(myroot.getElementsByTagName("announced")[0],
format="strip"))
- # Support both formats of revised:
- # <revised>December 30, 2007: 02</revised>
+ # Support only format defined in GLSA DTD
# <revised count="2">2007-12-30</revised>
revisedEl = myroot.getElementsByTagName("revised")[0]
self.revised = getText(revisedEl, format="strip")
count = revisedEl.getAttribute("count")
if not count:
- if self.revised.find(":") >= 0:
- (self.revised, count) = self.revised.split(":")
- else:
- count = 1
+ raise GlsaFormatException("Invalid revision attribute
in GLSA: " + myroot.getAttribute("id"))
self.revised = format_date(self.revised)
- try:
- self.count = int(count)
- except ValueError:
- # TODO should this raise a GlsaFormatException?
- self.count = 1
-
# now the optional and 0-n toplevel, #PCDATA tags and references
try:
self.access =
getText(myroot.getElementsByTagName("access")[0], format="strip")
--
2.22.0
