glsa: account for EAPI 5 sub-slot in SLOT

diff --git a/bin/glsa-check b/bin/glsa-check
index eddc9050efaa25a12a2df80ec05cf13f0926c923..bfae0f997c8fa9fd4118f8b467918fd1777dd79d 100755 (executable)
--- 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 d3c3b3da78b68559b776f1df214e806aa0daf913..5bff6879da3d3d58037fb15ecb36dc7d0a6d60eb 100644 (file)
--- 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