From: Zac Medico <zmedico@gentoo.org>
Date: Thu, 18 Oct 2012 00:04:53 +0000 (-0700)
Subject: glsa: account for EAPI 5 sub-slot in SLOT
X-Git-Tag: v2.2.0_alpha141~23
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=873deb19db6bdc1201b83f44f85da0d44962b98b;p=portage.git

glsa: account for EAPI 5 sub-slot in SLOT
---

diff --git a/bin/glsa-check b/bin/glsa-check
index eddc9050e..bfae0f997 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 d3c3b3da7..5bff6879d 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