summaryrefslogtreecommitdiffstats
path: root/pym/portage
diff options
context:
space:
mode:
authorMarius Mauch <genone@gentoo.org>2007-11-09 15:07:18 +0000
committerMarius Mauch <genone@gentoo.org>2007-11-09 15:07:18 +0000
commita3d594873b6faf8fc63749fbd91b0bf2cc923ce9 (patch)
tree8f95341c2946440bdced923a878cf67b5b3f6443 /pym/portage
parenteae4c521880e3b4875d9081be026dd8f80daa28a (diff)
downloadportage-a3d594873b6faf8fc63749fbd91b0bf2cc923ce9.tar.gz
portage-a3d594873b6faf8fc63749fbd91b0bf2cc923ce9.tar.bz2
portage-a3d594873b6faf8fc63749fbd91b0bf2cc923ce9.zip
revert getMergeList to return CPVs again instead of atoms
svn path=/main/trunk/; revision=8477
Diffstat (limited to 'pym/portage')
-rw-r--r--pym/portage/glsa.py2
-rw-r--r--pym/portage/sets/security.py2
2 files changed, 2 insertions, 2 deletions
diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py
index 7e205d63a..91f719c8f 100644
--- a/pym/portage/glsa.py
+++ b/pym/portage/glsa.py
@@ -590,4 +590,4 @@ class Glsa:
self.portdbapi, self.vardbapi, minimize=least_change)
if update:
rValue.append(update)
- return ["="+x for x in rValue]
+ return rValue
diff --git a/pym/portage/sets/security.py b/pym/portage/sets/security.py
index b53326990..a172e6f8c 100644
--- a/pym/portage/sets/security.py
+++ b/pym/portage/sets/security.py
@@ -40,7 +40,7 @@ class SecuritySet(PackageSet):
myglsa = glsa.Glsa(glsaid, self._settings, self._vardbapi, self._portdbapi)
#print glsaid, myglsa.isVulnerable(), myglsa.isApplied(), myglsa.getMergeList()
if self.useGlsa(myglsa):
- atomlist += myglsa.getMergeList(least_change=self._least_change)
+ atomlist += ["="+x for x in myglsa.getMergeList(least_change=self._least_change)]
self._setAtoms(atomlist)
def useGlsa(self, myglsa):