diff options
Diffstat (limited to 'desktop/modules/updates')
| -rw-r--r-- | desktop/modules/updates/test_updatesctl.py | 3 | ||||
| -rwxr-xr-x | desktop/modules/updates/updatesctl | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/desktop/modules/updates/test_updatesctl.py b/desktop/modules/updates/test_updatesctl.py index 0714e4e..a4d0cc0 100644 --- a/desktop/modules/updates/test_updatesctl.py +++ b/desktop/modules/updates/test_updatesctl.py @@ -126,8 +126,9 @@ w(tmp / "etc/slackpkg/mirrors", "# a comment\nfile://mnt/mirror/\n") w(tmp / "etc/slackpkg/blacklist", '"testing/"\n[0-9]+_SBo\n') w(tmp / "mnt/mirror/PACKAGES.TXT", pkgtxt([ ("slackware64/l", "glibc-2.44-x86_64-4"), - ("slackware64/a", "bash-5.3-x86_64-1"), + # testing/ first: the blacklisted entry must lose even when it comes first. ("testing/packages", "bash-5.4-x86_64-1"), + ("slackware64/a", "bash-5.3-x86_64-1"), ("slackware64/a", "foo-1.1-x86_64-1"), ("slackware64/l", "libtatsu-1.0.5-x86_64-1"), ])) diff --git a/desktop/modules/updates/updatesctl b/desktop/modules/updates/updatesctl index 835f3d0..ee843c2 100755 --- a/desktop/modules/updates/updatesctl +++ b/desktop/modules/updates/updatesctl @@ -246,7 +246,7 @@ def tracked(installed, errors): if i and b and vercmp(b, i) > 0: out["upgrade"].append(row(name, label, i, b)) - elif i and r and vercmp(r, up) >= 0 and (not b or vercmp(b, up) < 0): + elif i and r and vercmp(r, up) >= 0: if vercmp(i, up) < 0: out["build"].append(row(name, label, b or i, up)) elif i or (r and label != "SBo"): |