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 03F2E138010 for ; Thu, 18 Oct 2012 00:05:14 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 7EFD2E001B; Thu, 18 Oct 2012 00:05:06 +0000 (UTC) Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183]) by pigeon.gentoo.org (Postfix) with ESMTP id 0DA21E001B for ; Thu, 18 Oct 2012 00:05:05 +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 700D133D751 for ; Thu, 18 Oct 2012 00:05:05 +0000 (UTC) Received: from localhost.localdomain (localhost [127.0.0.1]) by hornbill.gentoo.org (Postfix) with ESMTP id 17AC1E5436 for ; Thu, 18 Oct 2012 00:05:04 +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: <1350518693.873deb19db6bdc1201b83f44f85da0d44962b98b.zmedico@gentoo> Subject: [gentoo-commits] proj/portage:master commit in: bin/, pym/portage/ X-VCS-Repository: proj/portage X-VCS-Files: bin/glsa-check pym/portage/glsa.py X-VCS-Directories: bin/ pym/portage/ X-VCS-Committer: zmedico X-VCS-Committer-Name: Zac Medico X-VCS-Revision: 873deb19db6bdc1201b83f44f85da0d44962b98b X-VCS-Branch: master Date: Thu, 18 Oct 2012 00:05:04 +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: 59725600-3e38-4cc9-9182-983e629c4ad8 X-Archives-Hash: cfa09a6230627e410442a673c7ec1fb1 commit: 873deb19db6bdc1201b83f44f85da0d44962b98b Author: Zac Medico gentoo org> AuthorDate: Thu Oct 18 00:04:53 2012 +0000 Commit: Zac Medico gentoo org> CommitDate: Thu Oct 18 00:04:53 2012 +0000 URL: http://git.overlays.gentoo.org/gitweb/?p=proj/portage.git;a=commit;h=873deb19 glsa: account for EAPI 5 sub-slot in SLOT --- bin/glsa-check | 2 +- pym/portage/glsa.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/bin/glsa-check b/bin/glsa-check index eddc905..bfae0f9 100755 --- a/bin/glsa-check +++ b/bin/glsa-check @@ -226,7 +226,7 @@ if mode in ["dump", "fix", "inject", "pretend"]: for pkg in mergelist: oldver = None for x in vardb.match(portage.cpv_getkey(pkg)): - if vardb.aux_get(x, ["SLOT"]) == portdb.aux_get(pkg, ["SLOT"]): + if vardb._pkg_str(x, None).slot == portdb._pkg_str(pkg, None).slot: oldver = x if oldver == None: raise ValueError("could not find old version for package %s" % pkg) diff --git a/pym/portage/glsa.py b/pym/portage/glsa.py index d3c3b3d..5bff687 100644 --- a/pym/portage/glsa.py +++ b/pym/portage/glsa.py @@ -378,7 +378,7 @@ def getMinUpgrade(vulnerableList, unaffectedList, portdbapi, vardbapi, minimize= or not match("="+rValue, portdbapi) \ or (minimize ^ (vercmp(c.version, rValue.version) > 0)) \ and match("="+c, portdbapi)) \ - and portdbapi.aux_get(c, ["SLOT"]) == vardbapi.aux_get(best(v_installed), ["SLOT"]): + and portdbapi._pkg_str(c, None).slot == vardbapi._pkg_str(best(v_installed), None).slot: rValue = c return rValue