diff options
author | Jon Turney <jon.turney@dronecode.org.uk> | 2023-01-05 19:13:46 +0300 |
---|---|---|
committer | Jon Turney <jon.turney@dronecode.org.uk> | 2023-01-07 20:05:19 +0300 |
commit | b0ea56b7f82ba930d16304e0860f444689bd7d69 (patch) | |
tree | 851982b8f618a653babad23cb3606817191c136b /calm/package.py | |
parent | 31819b5ed1b2523cb272a1474cd00ce6bddca33c (diff) |
Allow regex matching for old_style_obsolete_by data
Diffstat (limited to 'calm/package.py')
-rwxr-xr-x | calm/package.py | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/calm/package.py b/calm/package.py index d8e9432..c2bab34 100755 --- a/calm/package.py +++ b/calm/package.py @@ -605,9 +605,13 @@ def upgrade_oldstyle_obsoletes(packages): requires = packages[p].version_hints[vr].get('depends', '').split(', ') requires = [re.sub(r'(.*) +\(.*\)', r'\1', r) for r in requires] - if p in past_mistakes.old_style_obsolete_by: - o = past_mistakes.old_style_obsolete_by[p] + o = None + for oso_re, oso_o in past_mistakes.old_style_obsolete_by.items(): + if re.match(r'^' + oso_re + r'$', p): + o = oso_o + break + if o is not None: # empty replacement means "ignore" if not o: continue |