revert getMergeList to return CPVs again instead of atoms

svn path=/main/trunk/; revision=8477

diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py
index 7e205d63a791d201db510c28834a282779a65ae9..91f719c8f0812b5543db390642e3ed20fde5204f 100644 (file)
--- 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 b5332699078e21a1db1b78d096ef2112a9d230d7..a172e6f8c06fdc203dcab2c9c2e08633342f62cd 100644 (file)
--- 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):