| 1 |
Author: genone |
| 2 |
Date: 2008-09-28 18:39:44 +0000 (Sun, 28 Sep 2008) |
| 3 |
New Revision: 11588 |
| 4 |
|
| 5 |
Modified: |
| 6 |
main/trunk/pym/portage/glsa.py |
| 7 |
Log: |
| 8 |
account for DTD changes wrt 'revised' element (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:09:01 UTC (rev 11587) |
| 13 |
+++ main/trunk/pym/portage/glsa.py 2008-09-28 18:39:44 UTC (rev 11588) |
| 14 |
@@ -442,8 +442,24 @@ |
| 15 |
self.title = getText(myroot.getElementsByTagName("title")[0], format="strip") |
| 16 |
self.synopsis = getText(myroot.getElementsByTagName("synopsis")[0], format="strip") |
| 17 |
self.announced = getText(myroot.getElementsByTagName("announced")[0], format="strip") |
| 18 |
- self.revised = getText(myroot.getElementsByTagName("revised")[0], format="strip") |
| 19 |
|
| 20 |
+ count = 1 |
| 21 |
+ # Support both formats of revised: |
| 22 |
+ # <revised>December 30, 2007: 02</revised> |
| 23 |
+ # <revised count="2">2007-12-30</revised> |
| 24 |
+ revisedEl = myroot.getElementsByTagName("revised")[0] |
| 25 |
+ self.revised = getText(revisedEl, format="strip") |
| 26 |
+ if (revisedEl.attributes.has_key("count")): |
| 27 |
+ count = revisedEl.getAttribute("count") |
| 28 |
+ elif (self.revised.find(":") >= 0): |
| 29 |
+ (self.revised, count) = self.revised.split(":") |
| 30 |
+ |
| 31 |
+ try: |
| 32 |
+ self.count = int(count) |
| 33 |
+ except ValueError: |
| 34 |
+ # TODO should this rais a GlsaFormatException? |
| 35 |
+ self.count = 1 |
| 36 |
+ |
| 37 |
# now the optional and 0-n toplevel, #PCDATA tags and references |
| 38 |
try: |
| 39 |
self.access = getText(myroot.getElementsByTagName("access")[0], format="strip") |
| 40 |
@@ -499,7 +515,7 @@ |
| 41 |
outstream.write((width*"=")+"\n") |
| 42 |
outstream.write(wrap(self.synopsis, width, caption="Synopsis: ")+"\n") |
| 43 |
outstream.write("Announced on: %s\n" % self.announced) |
| 44 |
- outstream.write("Last revised on: %s\n\n" % self.revised) |
| 45 |
+ outstream.write("Last revised on: %s : %02d\n\n" % (self.revised, self.count)) |
| 46 |
if self.glsatype == "ebuild": |
| 47 |
for k in self.packages.keys(): |
| 48 |
pkg = self.packages[k] |
Archives