From 5e79d2c2c5f77358b41b6bdbc14b00e6b5cd55a3 Mon Sep 17 00:00:00 2001 From: Brian May Date: Wed, 4 Dec 2019 17:21:13 +1100 Subject: Revert "Fix references to DLA regression updates on website" This reverts commit 7177c0e348acbd70b76de7fc36116d02201bc9bf. I accidentally pushed this to the wrong branch. --- bin/tracker_service.py | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'bin') diff --git a/bin/tracker_service.py b/bin/tracker_service.py index d45d83b6a1..9f45dab8a8 100755 --- a/bin/tracker_service.py +++ b/bin/tracker_service.py @@ -1570,20 +1570,16 @@ Debian bug number.'''), % (int(y), int(number))) return None - def url_dla(self, url, dla, re_dla=re.compile(r'^DLA-(\d+)(-\d+)?$')): + def url_dla(self, url, dla, re_dla=re.compile(r'^DLA-(\d+)(?:-\d+)?$')): match = re_dla.match(dla) if match: - (number,revision) = match.groups() - if revision == "-1": - link = "dla-%d" % int(number) - else: - link = dla.lower() # We must determine the year because there is no generic URL. + (number,) = match.groups() for (date,) in self.db.cursor().execute( "SELECT release_date FROM bugs WHERE name = ?", (dla,)): (y, m, d) = date.split('-') - return url.absolute("https://www.debian.org/lts/security/%d/%s" - % (int(y), link)) + return url.absolute("https://www.debian.org/lts/security/%d/dla-%d" + % (int(y), int(number))) return None def url_debian_bug(self, url, debian): -- cgit v1.2.3