diff --git a/bugbug/bug_snapshot.py b/bugbug/bug_snapshot.py index 28f216da..f732c30b 100644 --- a/bugbug/bug_snapshot.py +++ b/bugbug/bug_snapshot.py @@ -315,7 +315,8 @@ def rollback(bug, when, verbose=True, all_inconsistencies=False): if field in bug and not is_email(bug[field]): if bug[field] != new_value: # TODO: try to remove the cf_ part when https://bugzilla.mozilla.org/show_bug.cgi?id=1508695 is fixed. - if not all_inconsistencies and (any(field.startswith(k) for k in ['cf_']) or bug['id'] in [1304729, 1304515, 1312722, 1337747]) or (field == 'url' and bug['id'] == 740223): + # The 'enhancement' severity has been removed, but it doesn't show up in the history. + if not all_inconsistencies and ((any(field.startswith(k) for k in ['cf_']) or bug['id'] in [1304729, 1304515, 1312722, 1337747]) or (field == 'url' and bug['id'] == 740223) or (field == 'severity' and new_value == 'enhancement')): print(f'Current value for field {field} of {bug["id"]}:\n{bug[field]}\nis different from previous value:\n{new_value}') else: assert False, f'Current value for field {field} of {bug["id"]}:\n{bug[field]}\nis different from previous value:\n{new_value}'