bin/lts-cve-triage.py: Differentiate between issues that are triaged/non-triaged for LTS, but resolved in next LTS version.

git-svn-id: svn+ssh://svn.debian.org/svn/secure-testing@38897 e39458fd-73e7-0310-bf30-c45bca0a0e42

1 files changed, 14 insertions, 2 deletions

diff --git a/bin/lts-cve-triage.py b/bin/lts-cve-triage.py
index 546950be2b..6cfed61888 100755
--- a/bin/lts-cve-triage.py
+++ b/bin/lts-cve-triage.py
@@ -32,6 +32,8 @@ LIST_NAMES = (
      'Other issues to triage (no special status)'),
     ('triage_other_not_triaged_in_next_lts',
      'Other issues to triage for {this_lts} (not yet triaged for {next_lts})'.format(this_lts=this_lts, next_lts=next_lts)),
+    ('triage_possible_easy_fixes',
+     'Issues not yet triaged for {}, but probably easy to fix (because already fixed in {})'.format(this_lts, next_lts)),
     ('unexpected_nodsa',
      'Issues tagged no-dsa in {this_lts} that are open in {next_lts}'.format(this_lts=this_lts, next_lts=next_lts)),
     ('possible_easy_fixes',
@@ -67,6 +69,9 @@ for pkg in tracker.iterate_packages():
 
         if status_in_lts.status == 'open':
             if pkg not in tracker.dla_needed:  # Issues not triaged yet
+
+                # package issues in LTS that still need being triaged
+
                 if status_in_next_lts.status == 'open':
                     if pkg in tracker.dsa_needed:
                         add_to_list('triage_already_in_dsa_needed', pkg, issue)
@@ -76,10 +81,17 @@ for pkg in tracker.iterate_packages():
                 elif (status_in_next_lts.status == 'ignored' and
                         status_in_next_lts.reason == 'no-dsa'):
                     add_to_list('triage_likely_nodsa', pkg, issue)
+                elif status_in_next_lts.status == 'resolved':
+                    add_to_list('triage_possible_easy_fixes', pkg, issue)
                 else:
                     add_to_list('triage_other', pkg, issue)
-            if status_in_next_lts.status == 'resolved':
-                add_to_list('possible_easy_fixes', pkg, issue)
+
+            else:
+
+                # package issues already triaged for LTS...
+
+                if status_in_next_lts.status == 'resolved':
+                    add_to_list('possible_easy_fixes', pkg, issue)
 
         if (status_in_lts.status == 'ignored' and
                 status_in_lts.reason == 'no-dsa' and