From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) by finch.gentoo.org (Postfix) with ESMTP id 2C42813855A for ; Sat, 19 Jan 2013 06:14:36 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id A96C521C006; Sat, 19 Jan 2013 06:14:35 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 45BD321C006 for ; Sat, 19 Jan 2013 06:14:35 +0000 (UTC) Received: from hornbill.gentoo.org (hornbill.gentoo.org [94.100.119.163]) (using TLSv1 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5A1C933D876 for ; Sat, 19 Jan 2013 06:14:34 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 7FE64E4073 for ; Sat, 19 Jan 2013 06:14:31 +0000 (UTC) From: "Zac Medico" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Zac Medico" Message-ID: <1358576056.91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: pym/portage/glsa.py X-VCS-Directories: pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e X-VCS-Branch: master Date: Sat, 19 Jan 2013 06:14:31 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Archives-Salt: 67e09369-e886-4a51-94a1-1f501aa35de9 X-Archives-Hash: e1bc9e2de46270314cbc0a2d9a769f6b commit: 91aeef92a207cbe6bcc70a6420fe4e78c7c5dc9e Author: Zac Medico gentoo org> AuthorDate: Sat Jan 19 06:14:16 2013 +0000 Commit: Zac Medico gentoo org> CommitDate: Sat Jan 19 06:14:16 2013 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=91aeef92 glsa.py: fix misc breakage --- pym/portage/glsa.py | 5 +++-- 1 files changed, 3 insertions(+), 2 deletions(-) diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py index 1dd8a98..cac0f1a 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