Add back unsupported packages but in a dedicated list

We still need to mark the entries as <end-of-life> when
we don't support the package so that it disappears from the
tracker and from the TODO list of package maintainers.

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

1 files changed, 14 insertions, 7 deletions

diff --git a/bin/lts-cve-triage.py b/bin/lts-cve-triage.py
index 975061f02f..58d409da02 100755
--- a/bin/lts-cve-triage.py
+++ b/bin/lts-cve-triage.py
@@ -32,6 +32,10 @@ except ImportError:
     pass
 
 LIST_NAMES = (
+    ('triage_end_of_life',
+     'Issues to mark as <end-of-life> for {lts}'.format(**RELEASES)),
+    ('triage_limited_support',
+     'Issues on packages with limited support (review support rules)'),
     ('triage_already_in_dsa_needed',
      ('Issues to triage for {lts} that are already in dsa-needed'
      ).format(**RELEASES)),
@@ -65,8 +69,6 @@ parser.add_argument('--skip-dla-needed', action='store_true',
                     help='Skip packages already in dla-needed.txt')
 parser.add_argument('--skip-cache-update', action='store_true',
                     help='Skip updating the tracker data cache')
-parser.add_argument('--include-limited', action='store_true',
-                    help='Include packages with limited security support')
 parser.add_argument('--filter', nargs='+', choices=[x[0] for x in LIST_NAMES],
                     help='Only report on specified lists')
 parser.add_argument('--exclude', nargs='+', choices=[x[0] for x in LIST_NAMES],
@@ -75,21 +77,18 @@ args = parser.parse_args()
 
 tracker = TrackerData(update_cache=not args.skip_cache_update)
 unsupported = UnsupportedPackages(update_cache=not args.skip_cache_update)
-if not args.include_limited:
-    unsupported = unsupported.union(LimitedSupportPackages(update_cache=not args.skip_cache_update))
+limited = LimitedSupportPackages(update_cache=not args.skip_cache_update)
 
 
 def add_to_list(key, pkg, issue):
     assert key in [l[0] for l in LIST_NAMES]
     lists[key][pkg].append(issue)
 
+
 for pkg in tracker.iterate_packages():
     if args.skip_dla_needed and pkg in tracker.dla_needed:
         continue
 
-    if pkg in unsupported:
-        continue
-
     for issue in tracker.iterate_pkg_issues(pkg):
         status_in_lts = issue.get_status('lts')
         status_in_next_lts = issue.get_status('next_lts')
@@ -98,10 +97,18 @@ for pkg in tracker.iterate_packages():
             continue
 
         if status_in_lts.status == 'open':
+            if pkg in unsupported:
+                add_to_list('triage_end_of_life', pkg, issue)
+                continue
+
             if pkg not in tracker.dla_needed:  # Issues not triaged yet
 
                 # package issues in LTS that still need being triaged
 
+                if pkg in limited:
+                    add_to_list('triage_limited_support', pkg, issue)
+                    continue
+
                 if status_in_next_lts.status == 'open':
                     if pkg in tracker.dsa_needed:
                         add_to_list('triage_already_in_dsa_needed', pkg, issue)