From 91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e Mon Sep 17 00:00:00 2001 From: Zac Medico Date: Fri, 18 Jan 2013 22:14:16 -0800 Subject: glsa.py: fix misc breakage --- pym/portage/glsa.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py index 1dd8a98b9..cac0f1a6d 100644 --- a/pym/portage/glsa.py +++ b/pym/portage/glsa.py @@ -379,7 +379,7 @@ def getMinUpgrade(vulnerableList, unaffectedList, portdbapi, vardbapi, minimize= for u in unaffectedList: # TODO: This had match_type="match-all" before. I don't think it should # since we disregarded masked items later anyway (match(=rValue, "porttree")) - avail_updates.update(match(u, "porttree")) + avail_updates.update(match(u, portdbapi)) # if an atom is already installed, we should not consider it for upgrades avail_updates.difference_update(u_installed) @@ -718,7 +718,8 @@ class Glsa: systemAffection = [] for pkg in self.packages.keys(): for path in self.packages[pkg]: - update = getMinUpgrade(path["vul_atoms"], path["unaff_atoms"], minimize=least_change) + update = getMinUpgrade(path["vul_atoms"], path["unaff_atoms"], + self.portdbapi, self.vardbapi, minimize=least_change) if update: systemAffection.extend(update) return systemAffection -- cgit v1.2.3-1-g7c22