diff options
| -rw-r--r-- | trunk/ChangeLog | 1 | ||||
| -rw-r--r-- | trunk/src/glsa-check/glsa.py | 5 |
2 files changed, 5 insertions, 1 deletions
diff --git a/trunk/ChangeLog b/trunk/ChangeLog index 442a1a8..fd53aed 100644 --- a/trunk/ChangeLog +++ b/trunk/ChangeLog @@ -2,6 +2,7 @@ * glsa-check: check SLOT when selecting and displaying upgrades * glsa-check: new --emergelike option to use the best version within the same SLOT instead of the one with the smallest delta. + * glsa-check: prefer visible upgrades to masked upgrades 2007-05-21: Paul Varner <fuzzyray@gentoo.org> * echangelog: Add patch from genstef to fix issues from Bug 176337 diff --git a/trunk/src/glsa-check/glsa.py b/trunk/src/glsa-check/glsa.py index 87a39e4..32cde7e 100644 --- a/trunk/src/glsa-check/glsa.py +++ b/trunk/src/glsa-check/glsa.py @@ -386,7 +386,10 @@ def getMinUpgrade(vulnerableList, unaffectedList, minimize=True): c_pv = portage.catpkgsplit(c) i_pv = portage.catpkgsplit(portage.best(v_installed)) if portage.pkgcmp(c_pv[1:], i_pv[1:]) > 0 \ - and (rValue == None or (minimize ^ (portage.pkgcmp(c_pv[1:], portage.catpkgsplit(rValue)[1:]) > 0))) \ + and (rValue == None \ + or not match("="+rValue, "porttree") \ + or (minimize ^ (portage.pkgcmp(c_pv[1:], portage.catpkgsplit(rValue)[1:]) > 0)) \ + and match("="+c, "porttree")) \ and portage.db["/"]["porttree"].dbapi.aux_get(c, ["SLOT"]) == portage.db["/"]["vartree"].dbapi.aux_get(portage.best(v_installed), ["SLOT"]): rValue = c_pv[0]+"/"+c_pv[1]+"-"+c_pv[2] if c_pv[3] != "r0": # we don't like -r0 for display |