Merge branch 'distro-config' into 'master'

Distro config reunification

See merge request security-tracker-team/security-tracker!48

1 files changed, 23 insertions, 10 deletions

diff --git a/bin/lts-needs-forward-port.py b/bin/lts-needs-forward-port.py
index 4277a832bc..7a4d24c1d4 100755
--- a/bin/lts-needs-forward-port.py
+++ b/bin/lts-needs-forward-port.py
@@ -18,21 +18,33 @@
 
 import argparse
 import collections
+import os
 import sys
 
-from tracker_data import TrackerData, RELEASES
+from tracker_data import TrackerData
+
+def setup_path():
+    dirname = os.path.dirname
+    base = dirname(dirname(os.path.realpath(sys.argv[0])))
+    sys.path.insert(0, os.path.join(base, "lib", "python"))
+
+setup_path()
+import config
+
+lts = config.get_supported_releases()[0]
+next_lts = config.get_supported_releases()[1]
+oldstable = config.get_release_codename('oldstable')
 
-# lts is currently jessie, next_lts stretch
 LIST_NAMES = (
     ('needs_fix_in_next_lts',
-     ('Issues that are unfixed in {next_lts} but fixed in {lts}'
-      ).format(**RELEASES)),
+     ('Issues that are unfixed in {} but fixed in {}'
+      ).format(next_lts, lts)),
     ('needs_review_in_next_lts',
-     ('Issues that are no-dsa in {next_lts} but fixed in {lts}'
-      ).format(**RELEASES)),
+     ('Issues that are no-dsa in {} but fixed in {}'
+      ).format(next_lts, lts)),
     ('fixed_via_pu_in_oldstable',
-     ('Issues that will be fixed via p-u in {oldstable}'
-      ).format(**RELEASES)),
+     ('Issues that will be fixed via p-u in {}'
+      ).format(oldstable)),
 )
 
 
@@ -55,8 +67,8 @@ def main():
 
     for pkg in tracker.iterate_packages():
         for issue in tracker.iterate_pkg_issues(pkg):
-            status_in_lts = issue.get_status('lts')
-            status_in_next_lts = issue.get_status('next_lts')
+            status_in_lts = issue.get_status(lts)
+            status_in_next_lts = issue.get_status(next_lts)
 
             if status_in_lts.status in ('not-affected', 'open'):
                 continue
@@ -64,6 +76,7 @@ def main():
             if status_in_lts.status == 'resolved':
                 #  Package will be updated via the next oldstable
                 #  point release
+                #  FIXME: when lts == oldstable, this should look at the stable pu list
                 if (issue.name in tracker.oldstable_point_update and
                     pkg in tracker.oldstable_point_update[issue.name]):
                     add_to_list('fixed_via_pu_in_oldstable', pkg, issue)