From 886e9b7b74ccfa0d70faf14f4eca90a29dd6ce16 Mon Sep 17 00:00:00 2001 From: Jon Turney Date: Sun, 31 Mar 2024 15:24:29 +0100 Subject: [PATCH] Expire python34 left-overs --- calm/package.py | 7 +++---- calm/past_mistakes.py | 3 +-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/calm/package.py b/calm/package.py index 3b530cb..860bc64 100755 --- a/calm/package.py +++ b/calm/package.py @@ -1636,10 +1636,9 @@ def mark_fn(packages, po, v, certain_age, vault_requests): # - if package depends on anything in expired_provides # requires = po.version_hints[v].get('depends', '').split(', ') - if re.match(r'^python(|2|27)[-_]', pn): - if any(ep in requires for ep in past_mistakes.expired_provides) or po.obsolete: - logging.debug("package '%s' version '%s' not retained as it requires a provide known to be expired" % (pn, v)) - return Freshness.stale + if any(ep in requires for ep in past_mistakes.expired_provides): + logging.debug("package '%s' version '%s' not retained as it requires a provide known to be expired" % (pn, v)) + return Freshness.conditional # - explicitly marked as 'noretain' # diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py index e1bef6b..7f4e8ea 100644 --- a/calm/past_mistakes.py +++ b/calm/past_mistakes.py @@ -256,8 +256,7 @@ # provides: which don't exist and packages which require them should be expired expired_provides = [ - 'python2', - 'python27', + 'python34', ] # empty source packages