From a3d594873b6faf8fc63749fbd91b0bf2cc923ce9 Mon Sep 17 00:00:00 2001 From: Marius Mauch Date: Fri, 9 Nov 2007 15:07:18 +0000 Subject: [PATCH] revert getMergeList to return CPVs again instead of atoms svn path=/main/trunk/; revision=8477 --- pym/portage/glsa.py | 2 +- pym/portage/sets/security.py | 2 +- 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): -- 2.26.2