From ba251893f191816475def485b340c238e4f8aef4 Mon Sep 17 00:00:00 2001 From: Sylvain Beucler Date: Thu, 21 Apr 2022 08:54:47 +0200 Subject: Revert lts-cve-triage.py changes This reverts commit 3fceb4e21a287674f166442ed8f5e563010710ff. --- bin/lts-cve-triage.py | 14 +------------- 1 file changed, 1 insertion(+), 13 deletions(-) (limited to 'bin') diff --git a/bin/lts-cve-triage.py b/bin/lts-cve-triage.py index 05ec383b0b..bda1606819 100755 --- a/bin/lts-cve-triage.py +++ b/bin/lts-cve-triage.py @@ -64,9 +64,6 @@ LIST_NAMES = ( ('triage_possible_easy_fixes', ('Issues not yet triaged for {lts}, but already fixed in {next_lts}') .format(**RELEASES)), - ('triage_possible_missed_fixes', - ('Issues postponed for {lts}, but fixed in {next_lts} via DSA or point releases') - .format(**RELEASES)), ('triage_other_not_triaged_in_next_lts', ('Other issues to triage for {lts} (not yet triaged for {next_lts})') .format(**RELEASES)), @@ -156,20 +153,11 @@ for pkg in tracker.iterate_packages(): if status_in_next_lts.status == 'resolved': add_to_list('possible_easy_fixes', pkg, issue) - # //// + elif status_in_lts.status == 'ignored': if (status_in_lts.reason == 'no-dsa' and status_in_next_lts.status == 'open'): add_to_list('unexpected_nodsa', pkg, issue) - elif (status_in_lts.reason == 'no-dsa' and - status_in_next_lts.status == 'resolved'): - # include fixes from DSA or stable/oldstable point releases - # exclude issues explicitly ignored, and old fixes back in unstable - nodsa_reason = issue.data['releases'][RELEASES['lts']]['nodsa_reason'] - fixed_version = issue.data['releases'][RELEASES['next_lts']]['fixed_version'] - if (nodsa_reason != 'ignored' and - ('~deb' in fixed_version or '+deb' in fixed_version)): - add_to_list('triage_possible_missed_fixes', pkg, issue) elif status_in_lts.reason == 'undetermined': add_to_list('undetermined', pkg, issue) -- cgit v1.2.3