summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZac Medico <zmedico@gentoo.org>2013-01-18 22:14:16 -0800
committerZac Medico <zmedico@gentoo.org>2013-01-18 22:14:16 -0800
commit91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e (patch)
treebd8004fb31966b324fed4cb5e3695c5dc3ee52b5
parent0d7e395a3227264ff8bcc2c35d024c2b39e07679 (diff)
downloadportage-91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e.tar.gz
portage-91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e.tar.bz2
portage-91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e.zip
glsa.py: fix misc breakage
-rw-r--r--pym/portage/glsa.py5
1 files 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