From fbc09d2b525cda5d7e5bf5a13e4b8c60a2a0ed4c Mon Sep 17 00:00:00 2001 From: Aaron Rainbolt Date: Tue, 28 Feb 2023 22:33:47 -0600 Subject: [PATCH] Swapped in python3-distro in place of lsb_release. --- common/modules/automirror/main.py | 4 ++-- debian/changelog | 8 ++++++++ 2 files changed, 10 insertions(+), 2 deletions(-) diff --git a/common/modules/automirror/main.py b/common/modules/automirror/main.py index 012ef35..3b05a96 100644 --- a/common/modules/automirror/main.py +++ b/common/modules/automirror/main.py @@ -23,7 +23,7 @@ from urllib.error import HTTPError from urllib.error import URLError import socket import logging -from lsb_release import get_distro_information +import distro global sources sources = """# Automatically generated by Calamares on DATE. @@ -137,7 +137,7 @@ def get_subdomain_by_country(countrycode): def getcodename(): """Return the codename of the distribution, similar to lsb_release -cs""" - return get_distro_information()["CODENAME"] + return distro.codename() def changesources(subdomain): diff --git a/debian/changelog b/debian/changelog index 7ea0081..f87502d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +calamares-settings-ubuntu (1:23.04.4) lunar; urgency=medium + + * Switch from using the lsb_release python module to the distro module, as + the python module for lsb_release no longer exists in Lunar. + (LP: #2008685) + + -- Aaron Rainbolt Tue, 28 Feb 2023 19:27:13 -0600 + calamares-settings-ubuntu (1:23.04.3) lunar; urgency=medium * Fixed a syntax error that led to incorrect sidebar coloring (LP: #1991251).