From 1c38fe4217480f3d58969ba2cf071b14bd3583d4 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Mon, 12 Dec 2022 16:20:55 +0000 Subject: Don't convert blacklisted old-style obsoletes: to new-style ruby-atk-debuginfo is obsoleted by ruby, but depends on cygwin-debuginfo. The existing obsolete is the correct one. okular-odp has a strange anomaly where it's category _obsolete, but the oldest version depends on calligra-libs as a replacement, but more recent versions depend on okular-calligra, which is correct. --- calm/package.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/calm/package.py b/calm/package.py index 15a81c5..5fc7c4e 100755 --- a/calm/package.py +++ b/calm/package.py @@ -620,6 +620,11 @@ def upgrade_oldstyle_obsoletes(packages): logging.warning('%s %s is obsoleted by %d packages (%s)' % (p, vr, len(requires), requires)) continue + # ignore if o it's blacklisted + if o in ['cygwin-debuginfo', 'calligra-libs']: + logging.debug("not adding 'obsoletes: %s' to '%s' as blacklisted" % (p, o)) + continue + if o in packages: if o not in missing_obsolete: missing_obsolete[o] = set() -- cgit v1.2.3