Tim Andersson has proposed merging
~andersson123/autopkgtest-cloud:fix_running_webpage into
autopkgtest-cloud:master.
Requested reviews:
Canonical's Ubuntu QA (canonical-ubuntu-qa)
For more details, see:
https://code.launchpad.net/~andersson123/autopkgtest-cloud/+git/autopkgtest-cloud/+merge/447973
--
Your team Canonical's Ubuntu QA is requested to review the proposed merge of
~andersson123/autopkgtest-cloud:fix_running_webpage into
autopkgtest-cloud:master.
diff --git a/charms/focal/autopkgtest-web/webcontrol/browse.cgi b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
index d7d7146..e242fe4 100755
--- a/charms/focal/autopkgtest-web/webcontrol/browse.cgi
+++ b/charms/focal/autopkgtest-web/webcontrol/browse.cgi
@@ -12,6 +12,7 @@ from wsgiref.handlers import CGIHandler
import distro_info
import flask
+from distro_info import UbuntuDistroInfo
from werkzeug.middleware.proxy_fix import ProxyFix
app = flask.Flask("browse")
@@ -144,7 +145,6 @@ def get_queue_info():
with open("/var/lib/cache-amqp/queued.json", "r") as json_file:
queue_info_j = json.load(json_file)
- releases = queue_info_j["releases"]
arches = queue_info_j["arches"]
queues = queue_info_j["queues"]
@@ -158,8 +158,8 @@ def get_queue_info():
ctx.setdefault(context, {}).setdefault(release, {})[
arch
] = (size, requests)
-
- return (releases, arches, ctx)
+ d = UbuntuDistroInfo()
+ return (d.supported() + d.supported_esm(), arches, ctx)
def get_source_versions(db, release):
--
Mailing list: https://launchpad.net/~canonical-ubuntu-qa
Post to : canonical-ubuntu-qa@lists.launchpad.net
Unsubscribe : https://launchpad.net/~canonical-ubuntu-qa
More help : https://help.launchpad.net/ListHelp
