diff options
| author |   rbu <rbu@gentoo.org> | 2009-05-25 21:44:52 +0000 |
|---|---|---|
| committer | rbu <rbu@gentoo.org> | 2009-05-25 21:44:52 +0000 |
| commit | 2bae674de1f2552955b377afa1d72a67d6df5a53 (patch) | |
| tree | 09c40a55cfe88eae27fae055485cb937b97e1e07 | |
| parent | Make bin files executable (diff) | |
| download | gentoolkit-2bae674de1f2552955b377afa1d72a67d6df5a53.tar.gz gentoolkit-2bae674de1f2552955b377afa1d72a67d6df5a53.tar.bz2 gentoolkit-2bae674de1f2552955b377afa1d72a67d6df5a53.zip | |
Merge "Fixed bug 256013 and bug 256103, thanks to William Arlofski, Michael A. Smith and Andrey Kislyuk. Whitespace."
This was r579 by idl0r, but applied to the wrong paths in trunk.
From: idl0r <idl0r@e84c3a59-eaf8-0310-85df-8a9fcd7b4891>
Date: Mon, 4 May 2009 22:10:26 +0000
Subject: Fixed bug 256013 and bug 256103, thanks to William Arlofski,
Michael A. Smith and Andrey Kislyuk. Whitespace.
git-svn-id:
svn://anonsvn.gentoo.org/gentoolkit/trunk/src/glsa-check@579
e84c3a59-eaf8-0310-85df-8a9fcd7b4891
svn path=/trunk/gentoolkit/; revision=653
| -rw-r--r-- | man/glsa-check.1 | 2 | ||||
| -rw-r--r-- | pym/gentoolkit/glsa/__init__.py | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/man/glsa-check.1 b/man/glsa-check.1 index e31e339..eee5151 100644 --- a/man/glsa-check.1 +++ b/man/glsa-check.1 @@ -12,7 +12,7 @@ glsa\-check <\fIoption\fP> [\fIglsa\-list\fP] This tool is used to locally monitor and manage Gentoo Linux Security Advisories. Please read: .br -http://www.gentoo.org/proj/en/portage/glsa\-integration.xml +http://www.gentoo.org/security .br before reporting a bug. .LP diff --git a/pym/gentoolkit/glsa/__init__.py b/pym/gentoolkit/glsa/__init__.py index d283835..7d8895f 100644 --- a/pym/gentoolkit/glsa/__init__.py +++ b/pym/gentoolkit/glsa/__init__.py @@ -22,7 +22,7 @@ import operator import xml.dom.minidom from StringIO import StringIO -if sys.version_info[0:2] < (2,3): +if sys.version_info[0:2] < (2, 3): raise NotImplementedError("Python versions below 2.3 have broken XML code " \ +"and are not supported") @@ -33,8 +33,8 @@ except ImportError: import portage # Note: the space for rgt and rlt is important !! -opMapping = {"le": "<=", "lt": "<", "eq": "=", "gt": ">", "ge": ">=", - "rge": ">=~", "rle": "<=~", "rgt": " >~", "rlt": " <~"} +opMapping = {"le": "<=", "lt": "<", "eq": "=", "gt": ">", "ge": ">=", + "rge": ">=~", "rle": "<=~", "rgt": " >~", "rlt": " <~"} NEWLINE_ESCAPE = "!;\\n" # some random string to mark newlines that should be preserved SPACE_ESCAPE = "!;_" # some random string to mark spaces that should be preserved @@ -589,7 +589,7 @@ class Glsa: self.packages = {} for p in self.affected.getElementsByTagName("package"): name = p.getAttribute("name") - if not self.packages.has_key(name): + if not name in self.packages: self.packages[name] = [] tmp = {} tmp["arch"] = p.getAttribute("arch") |