From 20f0b653ee78c80c5faa849b2c3f0fcc50479fa4 Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Tue, 30 May 2023 12:16:14 +0200 Subject: lts-cve-triage: use correct debian-security-support branch We were downloading files from master instead of the suite branch, so e.g. python2.7 was marked as limited support when it's still supported in buster. --- bin/lts-cve-triage.py | 3 ++- bin/unsupported_packages.py | 10 +++++----- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'bin') diff --git a/bin/lts-cve-triage.py b/bin/lts-cve-triage.py index 53029cf379..309ffab6b4 100755 --- a/bin/lts-cve-triage.py +++ b/bin/lts-cve-triage.py @@ -99,7 +99,8 @@ args = parser.parse_args() tracker = TrackerData(update_cache=not args.skip_cache_update) unsupported = UnsupportedPackages(codename=RELEASES['lts'], update_cache=not args.skip_cache_update) -limited = LimitedSupportPackages(update_cache=not args.skip_cache_update) +limited = LimitedSupportPackages(codename=RELEASES['lts'], + update_cache=not args.skip_cache_update) # unsupport/limited package names can be regexps unsupported_re = re.compile('|'.join(unsupported)) limited_re = re.compile('|'.join(limited)) diff --git a/bin/unsupported_packages.py b/bin/unsupported_packages.py index c6c6fdc82f..1b33bccce1 100644 --- a/bin/unsupported_packages.py +++ b/bin/unsupported_packages.py @@ -49,7 +49,7 @@ class DebSecSupport(set): class UnsupportedPackages(DebSecSupport): - URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support-ended.deb{}" + URL = "https://salsa.debian.org/debian/debian-security-support/raw/{}/security-support-ended.deb{}" CACHED_DATA_PATH = "~/.cache/security-support-ended.deb{}" def __init__(self, codename, update_cache=True): @@ -57,7 +57,7 @@ class UnsupportedPackages(DebSecSupport): dists = list(config.get_config().keys()) self.debian_version = dists.index(codename) + 1 - self.url = self.URL.format(self.debian_version) + self.url = self.URL.format(codename, self.debian_version) self.cache = os.path.expanduser(self.CACHED_DATA_PATH).format( self.debian_version, @@ -67,10 +67,10 @@ class UnsupportedPackages(DebSecSupport): class LimitedSupportPackages(DebSecSupport): - URL = "https://salsa.debian.org/debian/debian-security-support/raw/master/security-support-limited" + URL = "https://salsa.debian.org/debian/debian-security-support/raw/{}/security-support-limited" CACHED_DATA_PATH = "~/.cache/security-support-limited" - def __init__(self, update_cache=True): - self.url = self.URL + def __init__(self, codename, update_cache=True): + self.url = self.URL.format(codename) self.cache = os.path.expanduser(self.CACHED_DATA_PATH) super(LimitedSupportPackages, self).__init__(update_cache) -- cgit v1.2.3