From 91c961eef4c0a8847d26f6043884748f504fb49a Mon Sep 17 00:00:00 2001 From: Emilio Pozuelo Monfort Date: Mon, 2 Dec 2019 13:05:20 +0100 Subject: tracker_service: unify *stable methods --- bin/tracker_service.py | 44 +++++++++++++++----------------------------- 1 file changed, 15 insertions(+), 29 deletions(-) (limited to 'bin') diff --git a/bin/tracker_service.py b/bin/tracker_service.py index e4d76af029..7a1080743f 100755 --- a/bin/tracker_service.py +++ b/bin/tracker_service.py @@ -145,17 +145,17 @@ class TrackerService(webservice_base_class): self.register('source-package/*', self.page_source_package) if config.get_release_codename('oldoldstable'): self.register('status/release/oldoldstable', - self.page_status_release_oldoldstable) + self.page_status_release_stable_like) self.register('status/release/oldstable', - self.page_status_release_oldstable) - self.register('status/release/stable', self.page_status_release_stable) + self.page_status_release_stable_like) + self.register('status/release/stable', self.page_status_release_stable_like) self.register('status/release/stable-backports', - self.page_status_release_stable_backports) + self.page_status_release_backports_like) self.register('status/release/oldstable-backports', - self.page_status_release_oldstable_backports) + self.page_status_release_backports_like) if config.get_release_codename('oldoldstable'): self.register('status/release/oldoldstable-backports', - self.page_status_release_oldoldstable_backports) + self.page_status_release_backports_like) self.register('status/release/testing', self.page_status_release_testing) self.register('status/release/unstable', @@ -755,14 +755,10 @@ to improve our documentation and procedures, so feedback is welcome.""")])]) for this vulnerability.'''), self.nvd_text]) - def page_status_release_stable(self, path, params, url): - return self.page_status_release_stable_oldstable_oldoldstable('stable', params, url) - def page_status_release_oldstable(self, path, params, url): - return self.page_status_release_stable_oldstable_oldoldstable('oldstable', - params, url) - def page_status_release_oldoldstable(self, path, params, url): - return self.page_status_release_stable_oldstable_oldoldstable('oldoldstable', - params, url) + def page_status_release_stable_like(self, path, params, url): + release = os.path.basename(url.path_info) + + return self.page_status_release_stable_oldstable_oldoldstable(release, params, url) def page_status_release_testing(self, path, params, url): bf = BugFilter(params) @@ -883,24 +879,14 @@ to improve our documentation and procedures, so feedback is welcome.""")])]) title='Vulnerable source packages in the unstable suite', rel='sid') - def page_status_release_stable_backports(self, path, params, url): - return self.page_status_release_unstable_like( - path, params, url, - title='Vulnerable source packages among backports for stable', - rel=config.get_release_codename('stable', '-backports')) + def page_status_release_backports_like(self, path, params, url): + release = os.path.basename(url.path_info) + release = release.split("-")[0] - def page_status_release_oldstable_backports(self, path, params, url): return self.page_status_release_unstable_like( path, params, url, - title='Vulnerable source packages among backports for oldstable', - rel=config.get_release_codename('oldstable', '-backports')) - - def page_status_release_oldoldstable_backports(self, path, params, url): - return self.page_status_release_unstable_like( - path, params, url, - title='Vulnerable source packages among backports for oldoldstable', - rel=config.get_release_codename('oldoldstable', '-backports')) - + title='Vulnerable source packages among backports for ' + release, + rel=config.get_release_codename(release, '-backports')) def page_status_dtsa_candidates(self, path, params, url): bf = BugFilter(params,nonodsa=True,noignored=True,nopostponed=True) -- cgit v1.2.3