| 1 |
Author: rbu |
| 2 |
Date: 2009-05-25 21:44:52 +0000 (Mon, 25 May 2009) |
| 3 |
New Revision: 653 |
| 4 |
|
| 5 |
Modified: |
| 6 |
trunk/gentoolkit/man/glsa-check.1 |
| 7 |
trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py |
| 8 |
Log: |
| 9 |
Merge "Fixed bug 256013 and bug 256103, thanks to William Arlofski, Michael A. Smith and Andrey Kislyuk. Whitespace." |
| 10 |
|
| 11 |
This was r579 by idl0r, but applied to the wrong paths in trunk. |
| 12 |
|
| 13 |
From: idl0r <idl0r@e84c3a59-eaf8-0310-85df-8a9fcd7b4891> |
| 14 |
Date: Mon, 4 May 2009 22:10:26 +0000 |
| 15 |
Subject: Fixed bug 256013 and bug 256103, thanks to William Arlofski, |
| 16 |
Michael A. Smith and Andrey Kislyuk. Whitespace. |
| 17 |
|
| 18 |
git-svn-id: |
| 19 |
svn://anonsvn.gentoo.org/gentoolkit/trunk/src/glsa-check@579 |
| 20 |
e84c3a59-eaf8-0310-85df-8a9fcd7b4891 |
| 21 |
|
| 22 |
Modified: trunk/gentoolkit/man/glsa-check.1 |
| 23 |
=================================================================== |
| 24 |
--- trunk/gentoolkit/man/glsa-check.1 2009-05-25 21:43:31 UTC (rev 652) |
| 25 |
+++ trunk/gentoolkit/man/glsa-check.1 2009-05-25 21:44:52 UTC (rev 653) |
| 26 |
@@ -12,7 +12,7 @@ |
| 27 |
This tool is used to locally monitor and manage Gentoo Linux Security Advisories. |
| 28 |
Please read: |
| 29 |
.br |
| 30 |
-http://www.gentoo.org/proj/en/portage/glsa\-integration.xml |
| 31 |
+http://www.gentoo.org/security |
| 32 |
.br |
| 33 |
before reporting a bug. |
| 34 |
.LP |
| 35 |
|
| 36 |
Modified: trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py |
| 37 |
=================================================================== |
| 38 |
--- trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py 2009-05-25 21:43:31 UTC (rev 652) |
| 39 |
+++ trunk/gentoolkit/pym/gentoolkit/glsa/__init__.py 2009-05-25 21:44:52 UTC (rev 653) |
| 40 |
@@ -22,7 +22,7 @@ |
| 41 |
import xml.dom.minidom |
| 42 |
from StringIO import StringIO |
| 43 |
|
| 44 |
-if sys.version_info[0:2] < (2,3): |
| 45 |
+if sys.version_info[0:2] < (2, 3): |
| 46 |
raise NotImplementedError("Python versions below 2.3 have broken XML code " \ |
| 47 |
+"and are not supported") |
| 48 |
|
| 49 |
@@ -33,8 +33,8 @@ |
| 50 |
import portage |
| 51 |
|
| 52 |
# Note: the space for rgt and rlt is important !! |
| 53 |
-opMapping = {"le": "<=", "lt": "<", "eq": "=", "gt": ">", "ge": ">=", |
| 54 |
- "rge": ">=~", "rle": "<=~", "rgt": " >~", "rlt": " <~"} |
| 55 |
+opMapping = {"le": "<=", "lt": "<", "eq": "=", "gt": ">", "ge": ">=", |
| 56 |
+ "rge": ">=~", "rle": "<=~", "rgt": " >~", "rlt": " <~"} |
| 57 |
NEWLINE_ESCAPE = "!;\\n" # some random string to mark newlines that should be preserved |
| 58 |
SPACE_ESCAPE = "!;_" # some random string to mark spaces that should be preserved |
| 59 |
|
| 60 |
@@ -589,7 +589,7 @@ |
| 61 |
self.packages = {} |
| 62 |
for p in self.affected.getElementsByTagName("package"): |
| 63 |
name = p.getAttribute("name") |
| 64 |
- if not self.packages.has_key(name): |
| 65 |
+ if not name in self.packages: |
| 66 |
self.packages[name] = [] |
| 67 |
tmp = {} |
| 68 |
tmp["arch"] = p.getAttribute("arch") |
Archives