Merge ~jansdhillon/ubuntu/+source/landscape-client:lp2099283-package-reporter-fixes-focal into ubuntu/+source/landscape-client:ubuntu/focal-devel

[Jan-Yaeger Dhillon]

f3a75a7... by jansdhillon <email address hidden> on 2025-03-10

fix lp question number to avoid confusion with a separate bug

bef4e42... by jansdhillon <email address hidden> on 2025-03-10

update LP numbers in patches/changelog

Unmerged commits

bef4e42... by jansdhillon <email address hidden> on 2025-03-10

update LP numbers in patches/changelog

f3a75a7... by jansdhillon <email address hidden> on 2025-03-10

fix lp question number to avoid confusion with a separate bug

934a18a... by jansdhillon <email address hidden> on 2025-03-07

add lp403745-package-reporter-high-cpu.patch, lp2031036-parse-lsb-output.patch, and update changelog

diff --git a/debian/changelog b/debian/changelog
index 86246ae..ce8c1af 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+landscape-client (23.02-0ubuntu1~20.04.6) focal; urgency=medium
+
+  * d/p/package-reporter-high-cpu.patch: backport fix to reduce CPU usage of package-reporter by avoiding creating Origin objects from the Python apt package. (LP: #2099283)
+  * d/p/parse-lsb-output.patch: backport fix for error raised by package-reporter when parsing lsb output and add support for lsb modules. (LP: #2031036)
+
+ -- Jan-Yaeger Dhillon <[e-mail]>  Mon, 10 Mar 2025 16:50:42 -0700
+
 landscape-client (23.02-0ubuntu1~20.04.5) focal; urgency=medium
 
   * d/p/0002-fix-locale-error.path: revert previous fix for #1827857, as
diff --git a/debian/patches/package-reporter-high-cpu.patch b/debian/patches/package-reporter-high-cpu.patch
new file mode 100644
index 0000000..d0ea0f1
--- /dev/null
+++ b/debian/patches/package-reporter-high-cpu.patch
@@ -0,0 +1,110 @@
+Description: Reduce CPU usage of package-reporter (LP: #2099283)
+Author: Jan-Yaeger Dhillon, [e-mail]
+Origin: backport, https://github.com/canonical/landscape-client/commit/f5a6d8a924097a37e70ec25522bd748a341212bf
+Bug-Ubuntu: https://answers.launchpad.net/landscape-client/+question/403745
+Reviewed-by: Kevin Nasto, [e-mail]
+Last-Update: 2025-03-09
+Index: landscape-client/landscape/client/package/reporter.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/reporter.py
++++ landscape-client/landscape/client/package/reporter.py
+@@ -638,48 +638,53 @@ class PackageReporter(PackageTaskHandler
+         backports_archive = "{}-backports".format(lsb["code-name"])
+         security_archive = "{}-security".format(lsb["code-name"])
+ 
+-        for package in self._facade.get_packages():
++        for package_version in self._facade.get_packages():
++            # Get archives from the list of PackageFiles
++            # for the given package version rather than using
++            # package_version.origins from the Python apt package.
++            # We only want to check the archives, and creating
++            # Origins using package_version.origins is expensive.
++            # See /usr/lib/python3/dist-packages/apt/package.py
++            archives = [
++                # Ex. jammy-backports
++                package_file.archive
++                for package_file, _ in package_version._cand.file_list
++            ]
++
+             # Don't include package versions from the official backports
+             # archive. The backports archive is enabled by default since
+             # xenial with a pinning policy of 100. Ideally we would
+             # support pinning, but we don't yet. In the mean time, we
+             # ignore backports, so that packages don't get automatically
+             # upgraded to the backports version.
+-            backport_origins = [
+-                origin for origin in package.origins
+-                if origin.archive == backports_archive]
+-            if backport_origins and (
+-                    len(backport_origins) == len(package.origins)):
++            if all(archive == backports_archive for archive in archives):
+                 # Ignore the version if it's only in the official
+                 # backports archive. If it's somewhere else as well,
+                 # e.g. a PPA, we assume it was added manually and the
+                 # user wants to get updates from it.
+                 continue
+-            hash = self._facade.get_package_hash(package)
++            hash = self._facade.get_package_hash(package_version)
+             id = self._store.get_hash_id(hash)
+             if id is not None:
+-                if self._facade.is_package_installed(package):
++                if self._facade.is_package_installed(package_version):
+                     current_installed.add(id)
+-                    if self._facade.is_package_available(package):
++                    if self._facade.is_package_available(package_version):
+                         current_available.add(id)
+-                    if self._facade.is_package_autoremovable(package):
++                    if self._facade.is_package_autoremovable(package_version):
+                         current_autoremovable.add(id)
+                 else:
+                     current_available.add(id)
+ 
+                 # Are there any packages that this package is an upgrade for?
+-                if self._facade.is_package_upgrade(package):
++                if self._facade.is_package_upgrade(package_version):
+                     current_upgrades.add(id)
+ 
+                 # Is this package present in the security pocket?
+-                security_origins = any(
+-                    origin for origin in package.origins
+-                    if origin.archive == security_archive)
+-                if security_origins:
++                if security_archive in archives:
+                     current_security.add(id)
+ 
+-        for package in self._facade.get_locked_packages():
+-            hash = self._facade.get_package_hash(package)
++        for package_version in self._facade.get_locked_packages():
++            hash = self._facade.get_package_hash(package_version)
+             id = self._store.get_hash_id(hash)
+             if id is not None:
+                 current_locked.add(id)
+Index: landscape-client/landscape/client/package/tests/test_reporter.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/tests/test_reporter.py
++++ landscape-client/landscape/client/package/tests/test_reporter.py
+@@ -1067,6 +1067,24 @@ class PackageReporterAptTest(LandscapeTe
+         result = self.reporter.detect_packages_changes()
+         return result.addCallback(got_result)
+ 
++    def test_compute_packages_changes_package_origins_not_called(self):
++        """
++        Archive info is extracted directly from the package versions
++        and the apt.package.Version.origins property is not called
++        """
++        with mock.patch("apt.package.Version.origins") as version_origins_mock:
++            self.successResultOf(self.reporter._compute_packages_changes())
++        version_origins_mock.assert_not_called()
++
++    def test_compute_packages_changes_origins_not_created(self):
++        """
++        Archive info is extracted directly from the package versions
++        and no Origins are created (expensive find_index() is not called)
++        """
++        with mock.patch("apt.package.Origin.__init__") as origin_mock:
++            self.successResultOf(self.reporter._compute_packages_changes())
++        origin_mock.assert_not_called()
++
+     def test_detect_packages_changes_with_backports_others(self):
+         """
+         Packages coming from backport archives that aren't named like
diff --git a/debian/patches/parse-lsb-output.patch b/debian/patches/parse-lsb-output.patch
new file mode 100644
index 0000000..b852e19
--- /dev/null
+++ b/debian/patches/parse-lsb-output.patch
@@ -0,0 +1,1431 @@
+Description: Fix package-reporter error when parsing lsb output and support lsb modules (LP: #2031036)
+Origin: backport, https://github.com/canonical/landscape-client/commit/75742a35074a9a8296ea3d3f445a80df1764404d
+Bug-Ubuntu: https://bugs.launchpad.net/landscape-client/+bug/2031036
+Index: landscape-client/landscape/client/monitor/computerinfo.py
+===================================================================
+--- landscape-client.orig/landscape/client/monitor/computerinfo.py
++++ landscape-client/landscape/client/monitor/computerinfo.py
+@@ -1,13 +1,16 @@
+-import os
+ import logging
+-from twisted.internet.defer import inlineCallbacks, returnValue
++import os
+ 
++from twisted.internet.defer import inlineCallbacks
++from twisted.internet.defer import returnValue
++
++from landscape.client.monitor.plugin import MonitorPlugin
++from landscape.lib.cloud import fetch_ec2_meta_data
+ from landscape.lib.fetch import fetch_async
+ from landscape.lib.fs import read_text_file
+-from landscape.lib.lsb_release import LSB_RELEASE_FILENAME, parse_lsb_release
+-from landscape.lib.cloud import fetch_ec2_meta_data
+ from landscape.lib.network import get_fqdn
+-from landscape.client.monitor.plugin import MonitorPlugin
++from landscape.lib.os_release import OS_RELEASE_FILENAME
++from landscape.lib.os_release import parse_os_release
+ 
+ METADATA_RETRY_MAX = 3  # Number of retries to get EC2 meta-data
+ 
+@@ -22,13 +25,17 @@ class ComputerInfo(MonitorPlugin):
+     persist_name = "computer-info"
+     scope = "computer"
+ 
+-    def __init__(self, get_fqdn=get_fqdn,
+-                 meminfo_filename="/proc/meminfo",
+-                 lsb_release_filename=LSB_RELEASE_FILENAME,
+-                 root_path="/", fetch_async=fetch_async):
++    def __init__(
++        self,
++        get_fqdn=get_fqdn,
++        meminfo_filename="/proc/meminfo",
++        os_release_filename=OS_RELEASE_FILENAME,
++        root_path="/",
++        fetch_async=fetch_async,
++    ):
+         self._get_fqdn = get_fqdn
+         self._meminfo_filename = meminfo_filename
+-        self._lsb_release_filename = lsb_release_filename
++        self._os_release_filename = os_release_filename
+         self._root_path = root_path
+         self._cloud_instance_metadata = None
+         self._cloud_retries = 0
+@@ -125,17 +132,17 @@ class ComputerInfo(MonitorPlugin):
+     def _get_distribution_info(self):
+         """Get details about the distribution."""
+         message = {}
+-        message.update(parse_lsb_release(self._lsb_release_filename))
++        message.update(parse_os_release(self._os_release_filename))
+         return message
+ 
+     @inlineCallbacks
+     def _create_cloud_instance_metadata_message(self):
+         """Fetch cloud metadata and insert it in a message."""
+         message = None
+-        if (self._cloud_instance_metadata is None and
+-            self._cloud_retries < METADATA_RETRY_MAX
+-            ):
+-
++        if (
++            self._cloud_instance_metadata is None
++            and self._cloud_retries < METADATA_RETRY_MAX
++        ):
+             self._cloud_instance_metadata = yield self._fetch_ec2_meta_data()
+             message = self._cloud_instance_metadata
+         returnValue(message)
+Index: landscape-client/landscape/client/monitor/tests/test_computerinfo.py
+===================================================================
+--- landscape-client.orig/landscape/client/monitor/tests/test_computerinfo.py
++++ landscape-client/landscape/client/monitor/tests/test_computerinfo.py
+@@ -1,19 +1,32 @@
+-import mock
+ import os
+ import re
++from unittest import mock
+ 
+-from twisted.internet.defer import succeed, fail, inlineCallbacks
+-
+-from landscape.lib.fetch import HTTPCodeError, PyCurlError
++from twisted.internet.defer import fail
++from twisted.internet.defer import inlineCallbacks
++from twisted.internet.defer import succeed
++
++from landscape.client.monitor.computerinfo import ComputerInfo
++from landscape.client.monitor.computerinfo import METADATA_RETRY_MAX
++from landscape.client.tests.helpers import LandscapeTest
++from landscape.client.tests.helpers import MonitorHelper
++from landscape.lib.fetch import HTTPCodeError
++from landscape.lib.fetch import PyCurlError
+ from landscape.lib.fs import create_text_file
+-from landscape.client.monitor.computerinfo import (
+-        ComputerInfo, METADATA_RETRY_MAX)
+-from landscape.client.tests.helpers import LandscapeTest, MonitorHelper
+-
+-SAMPLE_LSB_RELEASE = "DISTRIB_ID=Ubuntu\n"                         \
+-                     "DISTRIB_RELEASE=6.06\n"                      \
+-                     "DISTRIB_CODENAME=dapper\n"                   \
+-                     "DISTRIB_DESCRIPTION=\"Ubuntu 6.06.1 LTS\"\n"
++
++SAMPLE_OS_RELEASE = """PRETTY_NAME="Ubuntu 22.04.3 LTS"
++NAME="Ubuntu"
++VERSION_ID="22.04"
++VERSION="22.04.3 LTS (Jammy Jellyfish)"
++VERSION_CODENAME=codename
++ID=ubuntu
++ID_LIKE=debian
++HOME_URL="https://www.ubuntu.com/"
++SUPPORT_URL="https://help.ubuntu.com/"
++BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
++PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
++UBUNTU_CODENAME=codename
++"""
+ 
+ 
+ def get_fqdn():
+@@ -21,7 +34,6 @@ def get_fqdn():
+ 
+ 
+ class ComputerInfoTest(LandscapeTest):
+-
+     helpers = [MonitorHelper]
+ 
+     sample_memory_info = """
+@@ -52,7 +64,7 @@ VmallocChunk:   107432 kB
+ 
+     def setUp(self):
+         LandscapeTest.setUp(self)
+-        self.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.query_results = {}
+ 
+         def fetch_stub(url, **kwargs):
+@@ -214,16 +226,16 @@ VmallocChunk:   107432 kB
+         the distribution data reported by the plugin.
+         """
+         self.mstore.set_accepted_types(["distribution-info"])
+-        plugin = ComputerInfo(lsb_release_filename=self.lsb_release_filename)
++        plugin = ComputerInfo(os_release_filename=self.os_release_filename)
+         self.monitor.add(plugin)
+ 
+         plugin.exchange()
+         message = self.mstore.get_pending_messages()[0]
+         self.assertEqual(message["type"], "distribution-info")
+         self.assertEqual(message["distributor-id"], "Ubuntu")
+-        self.assertEqual(message["description"], "Ubuntu 6.06.1 LTS")
+-        self.assertEqual(message["release"], "6.06")
+-        self.assertEqual(message["code-name"], "dapper")
++        self.assertEqual(message["description"], "Ubuntu 22.04.3 LTS")
++        self.assertEqual(message["release"], "22.04")
++        self.assertEqual(message["code-name"], "codename")
+ 
+     def test_distribution_reported_only_once(self):
+         """
+@@ -249,23 +261,25 @@ VmallocChunk:   107432 kB
+         the server.
+         """
+         self.mstore.set_accepted_types(["distribution-info"])
+-        plugin = ComputerInfo(lsb_release_filename=self.lsb_release_filename)
++        plugin = ComputerInfo(os_release_filename=self.os_release_filename)
+         self.monitor.add(plugin)
+ 
+         plugin.exchange()
+         message = self.mstore.get_pending_messages()[0]
+         self.assertEqual(message["type"], "distribution-info")
+         self.assertEqual(message["distributor-id"], "Ubuntu")
+-        self.assertEqual(message["description"], "Ubuntu 6.06.1 LTS")
+-        self.assertEqual(message["release"], "6.06")
+-        self.assertEqual(message["code-name"], "dapper")
+-
+-        plugin._lsb_release_filename = self.makeFile("""\
+-DISTRIB_ID=Ubuntu
+-DISTRIB_RELEASE=6.10
+-DISTRIB_CODENAME=edgy
+-DISTRIB_DESCRIPTION="Ubuntu 6.10"
+-""")
++        self.assertEqual(message["description"], "Ubuntu 22.04.3 LTS")
++        self.assertEqual(message["release"], "22.04")
++        self.assertEqual(message["code-name"], "codename")
++
++        plugin._os_release_filename = self.makeFile(
++            """\
++NAME=Ubuntu
++VERSION_ID=6.10
++VERSION_CODENAME=edgy
++PRETTY_NAME="Ubuntu 6.10"
++""",
++        )
+         plugin.exchange()
+         message = self.mstore.get_pending_messages()[1]
+         self.assertEqual(message["type"], "distribution-info")
+@@ -276,23 +290,25 @@ DISTRIB_DESCRIPTION="Ubuntu 6.10"
+ 
+     def test_unknown_distribution_key(self):
+         self.mstore.set_accepted_types(["distribution-info"])
+-        lsb_release_filename = self.makeFile("""\
+-DISTRIB_ID=Ubuntu
+-DISTRIB_RELEASE=6.10
+-DISTRIB_CODENAME=edgy
+-DISTRIB_DESCRIPTION="Ubuntu 6.10"
++        os_release_filename = self.makeFile(
++            """\
++NAME=Ubuntu
++VERSION_ID=22.04
++VERSION_CODENAME=codename
++PRETTY_NAME="Ubuntu 22.04.3 LTS"
+ DISTRIB_NEW_UNEXPECTED_KEY=ooga
+-""")
+-        plugin = ComputerInfo(lsb_release_filename=lsb_release_filename)
++""",
++        )
++        plugin = ComputerInfo(os_release_filename=os_release_filename)
+         self.monitor.add(plugin)
+ 
+         plugin.exchange()
+         message = self.mstore.get_pending_messages()[0]
+         self.assertEqual(message["type"], "distribution-info")
+         self.assertEqual(message["distributor-id"], "Ubuntu")
+-        self.assertEqual(message["description"], "Ubuntu 6.10")
+-        self.assertEqual(message["release"], "6.10")
+-        self.assertEqual(message["code-name"], "edgy")
++        self.assertEqual(message["description"], "Ubuntu 22.04.3 LTS")
++        self.assertEqual(message["release"], "22.04")
++        self.assertEqual(message["code-name"], "codename")
+ 
+     def test_resynchronize(self):
+         """
+@@ -301,11 +317,13 @@ DISTRIB_NEW_UNEXPECTED_KEY=ooga
+         """
+         self.mstore.set_accepted_types(["distribution-info", "computer-info"])
+         meminfo_filename = self.makeFile(self.sample_memory_info)
+-        plugin = ComputerInfo(get_fqdn=get_fqdn,
+-                              meminfo_filename=meminfo_filename,
+-                              lsb_release_filename=self.lsb_release_filename,
+-                              root_path=self.makeDir(),
+-                              fetch_async=self.fetch_func)
++        plugin = ComputerInfo(
++            get_fqdn=get_fqdn,
++            meminfo_filename=meminfo_filename,
++            os_release_filename=self.os_release_filename,
++            root_path=self.makeDir(),
++            fetch_async=self.fetch_func,
++        )
+         self.monitor.add(plugin)
+         plugin.exchange()
+         self.reactor.fire("resynchronize", scopes=["computer"])
+@@ -314,12 +332,17 @@ DISTRIB_NEW_UNEXPECTED_KEY=ooga
+                          "timestamp": 0, "total-memory": 1510,
+                          "total-swap": 1584}
+ 
+-        dist_info = {"type": "distribution-info",
+-                     "code-name": "dapper", "description": "Ubuntu 6.06.1 LTS",
+-                     "distributor-id": "Ubuntu", "release": "6.06"}
+-        self.assertMessages(self.mstore.get_pending_messages(),
+-                            [computer_info, dist_info,
+-                             computer_info, dist_info])
++        dist_info = {
++            "type": "distribution-info",
++            "code-name": "codename",
++            "description": "Ubuntu 22.04.3 LTS",
++            "distributor-id": "Ubuntu",
++            "release": "22.04",
++        }
++        self.assertMessages(
++            self.mstore.get_pending_messages(),
++            [computer_info, dist_info, computer_info, dist_info],
++        )
+ 
+     def test_computer_info_call_on_accepted(self):
+         plugin = ComputerInfo(fetch_async=self.fetch_func)
+Index: landscape-client/landscape/client/package/releaseupgrader.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/releaseupgrader.py
++++ landscape-client/landscape/client/package/releaseupgrader.py
+@@ -8,16 +8,22 @@ import tarfile
+ 
+ from twisted.internet.defer import succeed
+ 
++from landscape.client.manager.manager import FAILED
++from landscape.client.manager.manager import SUCCEEDED
++from landscape.client.package.reporter import find_reporter_command
++from landscape.client.package.taskhandler import PackageTaskHandler
++from landscape.client.package.taskhandler import (
++    PackageTaskHandlerConfiguration,
++)
++from landscape.client.package.taskhandler import run_task_handler
+ from landscape.lib.config import get_bindir
+-from landscape.lib.fetch import url_to_filename, fetch_to_files
+-from landscape.lib.lsb_release import parse_lsb_release, LSB_RELEASE_FILENAME
+-from landscape.lib.gpg import gpg_verify
++from landscape.lib.fetch import fetch_to_files
++from landscape.lib.fetch import url_to_filename
+ from landscape.lib.fs import read_text_file
+-from landscape.client.package.taskhandler import (
+-    PackageTaskHandlerConfiguration, PackageTaskHandler, run_task_handler)
++from landscape.lib.gpg import gpg_verify
++from landscape.lib.os_release import OS_RELEASE_FILENAME
++from landscape.lib.os_release import parse_os_release
+ from landscape.lib.twisted_util import spawn_process
+-from landscape.client.manager.manager import SUCCEEDED, FAILED
+-from landscape.client.package.reporter import find_reporter_command
+ 
+ 
+ class ReleaseUpgraderConfiguration(PackageTaskHandlerConfiguration):
+@@ -37,7 +43,7 @@ class ReleaseUpgrader(PackageTaskHandler
+     @cvar config_factory: The configuration class to use to build configuration
+         objects to be passed to our constructor.
+     @cvar queue_name: The queue we pick tasks from.
+-    @cvar lsb_release_filename: The path to the LSB data on the file system.
++    @cvar os_release_filename: The path to the OS data on the file system.
+     @cvar landscape_ppa_url: The URL of the Landscape PPA, if it is present
+         in the computer's sources.list it won't be commented out.
+     @cvar logs_directory: Path to the directory holding the upgrade-tool logs.
+@@ -47,7 +53,7 @@ class ReleaseUpgrader(PackageTaskHandler
+ 
+     config_factory = ReleaseUpgraderConfiguration
+     queue_name = "release-upgrader"
+-    lsb_release_filename = LSB_RELEASE_FILENAME
++    os_release_filename = OS_RELEASE_FILENAME
+     landscape_ppa_url = "http://ppa.launchpad.net/landscape/trunk/ubuntu/"
+     logs_directory = "/var/log/dist-upgrade"
+     logs_limit = 100000  # characters
+@@ -73,8 +79,8 @@ class ReleaseUpgrader(PackageTaskHandler
+         """
+         target_code_name = message["code-name"]
+         operation_id = message["operation-id"]
+-        lsb_release_info = parse_lsb_release(self.lsb_release_filename)
+-        current_code_name = lsb_release_info["code-name"]
++        os_release_info = parse_os_release(self.os_release_filename)
++        current_code_name = os_release_info["code-name"]
+ 
+         if target_code_name == current_code_name:
+             message = self.make_operation_result_message(
+Index: landscape-client/landscape/client/package/reporter.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/reporter.py
++++ landscape-client/landscape/client/package/reporter.py
+@@ -11,19 +11,28 @@ import apt_pkg
+ import re
+ 
+ from twisted.internet.defer import (
+-    Deferred, succeed, inlineCallbacks, returnValue)
++    Deferred,
++    succeed,
++    inlineCallbacks,
++    returnValue,
++)
+ 
+ from landscape.lib import bpickle
+ from landscape.lib.apt.package.store import (
+-        UnknownHashIDRequest, FakePackageStore)
++    UnknownHashIDRequest,
++    FakePackageStore,
++)
+ from landscape.lib.config import get_bindir
+ from landscape.lib.sequenceranges import sequence_to_ranges
+ from landscape.lib.twisted_util import gather_results, spawn_process
+ from landscape.lib.fetch import fetch_async
+ from landscape.lib.fs import touch_file, create_binary_file
+-from landscape.lib.lsb_release import parse_lsb_release, LSB_RELEASE_FILENAME
++from landscape.lib.os_release import parse_os_release
+ from landscape.client.package.taskhandler import (
+-    PackageTaskHandlerConfiguration, PackageTaskHandler, run_task_handler)
++    PackageTaskHandlerConfiguration,
++    PackageTaskHandler,
++    run_task_handler,
++)
+ 
+ 
+ HASH_ID_REQUEST_TIMEOUT = 7200
+@@ -116,7 +125,6 @@ class PackageReporter(PackageTaskHandler
+         """
+ 
+         def fetch_it(hash_id_db_filename):
+-
+             if hash_id_db_filename is None:
+                 # Couldn't determine which hash=>id database to fetch,
+                 # just ignore the failure and go on
+@@ -161,11 +169,9 @@ class PackageReporter(PackageTaskHandler
+         return result
+ 
+     def _get_hash_id_db_base_url(self):
+-
+         base_url = self._config.get("package_hash_id_url")
+ 
+         if not base_url:
+-
+             if not self._config.get("url"):
+                 # We really have no idea where to download from
+                 return None
+@@ -264,12 +270,13 @@ class PackageReporter(PackageTaskHandler
+ 
+         @return: a deferred returning (out, err, code)
+         """
+-        if (self._config.force_apt_update or
+-            self._apt_sources_have_changed() or
+-            self._apt_update_timeout_expired(self._config.apt_update_interval)
+-            ) and \
+-           not self._is_release_upgrader_running():
+-
++        if (
++            self._config.force_apt_update
++            or self._apt_sources_have_changed()
++            or self._apt_update_timeout_expired(
++                self._config.apt_update_interval,
++            )
++        ) and not self._is_release_upgrader_running():
+             accepted_apt_errors = (
+                 "Problem renaming the file /var/cache/apt/srcpkgcache.bin",
+                 "Problem renaming the file /var/cache/apt/pkgcache.bin")
+@@ -412,7 +419,6 @@ class PackageReporter(PackageTaskHandler
+         self._store.clear_autoremovable()
+ 
+     def _handle_unknown_packages(self, hashes):
+-
+         self._facade.ensure_channels_reloaded()
+ 
+         hashes = set(hashes)
+@@ -633,9 +639,9 @@ class PackageReporter(PackageTaskHandler
+         current_locked = set()
+         current_autoremovable = set()
+         current_security = set()
+-        lsb = parse_lsb_release(LSB_RELEASE_FILENAME)
+-        backports_archive = "{}-backports".format(lsb["code-name"])
+-        security_archive = "{}-security".format(lsb["code-name"])
++        os_release_info = parse_os_release()
++        backports_archive = "{}-backports".format(os_release_info["code-name"])
++        security_archive = "{}-security".format(os_release_info["code-name"])
+ 
+         for package_version in self._facade.get_packages():
+             # Get archives from the list of PackageFiles
+Index: landscape-client/landscape/client/package/taskhandler.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/taskhandler.py
++++ landscape-client/landscape/client/package/taskhandler.py
+@@ -1,16 +1,22 @@
++import logging
+ import os
+ import re
+-import logging
+ 
+-from twisted.internet.defer import succeed, Deferred, maybeDeferred
++from twisted.internet.defer import Deferred
++from twisted.internet.defer import maybeDeferred
++from twisted.internet.defer import succeed
+ 
+-from landscape.lib.apt.package.store import PackageStore, InvalidHashIdDb
+-from landscape.lib.lock import lock_path, LockError
+-from landscape.lib.log import log_failure
+-from landscape.lib.lsb_release import LSB_RELEASE_FILENAME, parse_lsb_release
+-from landscape.client.reactor import LandscapeReactor
+-from landscape.client.deployment import Configuration, init_logging
+ from landscape.client.broker.amp import RemoteBrokerConnector
++from landscape.client.deployment import Configuration
++from landscape.client.deployment import init_logging
++from landscape.client.reactor import LandscapeReactor
++from landscape.lib.apt.package.store import InvalidHashIdDb
++from landscape.lib.apt.package.store import PackageStore
++from landscape.lib.lock import lock_path
++from landscape.lib.lock import LockError
++from landscape.lib.log import log_failure
++from landscape.lib.os_release import OS_RELEASE_FILENAME
++from landscape.lib.os_release import parse_os_release
+ 
+ 
+ class PackageTaskError(Exception):
+@@ -69,7 +75,6 @@ class LazyRemoteBroker(object):
+         self._remote = None
+ 
+     def __getattr__(self, method):
+-
+         if self._remote:
+             return getattr(self._remote, method)
+ 
+@@ -85,12 +90,11 @@ class LazyRemoteBroker(object):
+         return wrapper
+ 
+ 
+-class PackageTaskHandler(object):
+-
++class PackageTaskHandler:
+     config_factory = PackageTaskHandlerConfiguration
+ 
+     queue_name = "default"
+-    lsb_release_filename = LSB_RELEASE_FILENAME
++    os_release_filename = OS_RELEASE_FILENAME
+     package_store_class = PackageStore
+ 
+     # This file is touched after every succesful 'apt-get update' run if the
+@@ -173,7 +177,6 @@ class PackageTaskHandler(object):
+         """
+ 
+         def use_it(hash_id_db_filename):
+-
+             if hash_id_db_filename is None:
+                 # Couldn't determine which hash=>id database to use,
+                 # just ignore the failure and go on
+@@ -206,7 +209,6 @@ class PackageTaskHandler(object):
+         """
+ 
+         def got_server_uuid(server_uuid):
+-
+             warning = "Couldn't determine which hash=>id database to use: %s"
+ 
+             if server_uuid is None:
+@@ -214,15 +216,17 @@ class PackageTaskHandler(object):
+                 return None
+ 
+             try:
+-                lsb_release_info = parse_lsb_release(self.lsb_release_filename)
+-            except IOError as error:
++                os_release_info = parse_os_release(self.os_release_filename)
++            except OSError as error:
+                 logging.warning(warning % str(error))
+                 return None
+             try:
+-                codename = lsb_release_info["code-name"]
++                codename = os_release_info["code-name"]
+             except KeyError:
+-                logging.warning(warning % "missing code-name key in %s" %
+-                                self.lsb_release_filename)
++                logging.warning(
++                    warning
++                    % f"missing code-name key in {self.os_release_filename}",
++                )
+                 return None
+ 
+             arch = self._facade.get_arch()
+Index: landscape-client/landscape/client/package/tests/test_releaseupgrader.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/tests/test_releaseupgrader.py
++++ landscape-client/landscape/client/package/tests/test_releaseupgrader.py
+@@ -1,20 +1,28 @@
+-import mock
+ import os
+ import signal
+ import tarfile
+ import unittest
++from unittest import mock
+ 
+ from twisted.internet import reactor
+-from twisted.internet.defer import succeed, fail, Deferred
+-
++from twisted.internet.defer import Deferred
++from twisted.internet.defer import fail
++from twisted.internet.defer import succeed
++
++from landscape.client.manager.manager import FAILED
++from landscape.client.manager.manager import SUCCEEDED
++from landscape.client.package.releaseupgrader import main
++from landscape.client.package.releaseupgrader import ReleaseUpgrader
++from landscape.client.package.releaseupgrader import (
++    ReleaseUpgraderConfiguration,
++)
++from landscape.client.tests.helpers import BrokerServiceHelper
++from landscape.client.tests.helpers import LandscapeTest
+ from landscape.lib.apt.package.store import PackageStore
+-from landscape.lib.gpg import InvalidGPGSignature
+ from landscape.lib.fetch import HTTPCodeError
+-from landscape.lib.testing import LogKeeperHelper, EnvironSaverHelper
+-from landscape.client.package.releaseupgrader import (
+-    ReleaseUpgrader, ReleaseUpgraderConfiguration, main)
+-from landscape.client.tests.helpers import LandscapeTest, BrokerServiceHelper
+-from landscape.client.manager.manager import SUCCEEDED, FAILED
++from landscape.lib.gpg import InvalidGPGSignature
++from landscape.lib.testing import EnvironSaverHelper
++from landscape.lib.testing import LogKeeperHelper
+ 
+ 
+ class ReleaseUpgraderConfigurationTest(unittest.TestCase):
+@@ -31,9 +39,7 @@ class ReleaseUpgraderConfigurationTest(u
+ 
+ 
+ class ReleaseUpgraderTest(LandscapeTest):
+-
+-    helpers = [LogKeeperHelper,
+-               EnvironSaverHelper, BrokerServiceHelper]
++    helpers = [LogKeeperHelper, EnvironSaverHelper, BrokerServiceHelper]
+ 
+     def setUp(self):
+         super(ReleaseUpgraderTest, self).setUp()
+@@ -307,7 +313,6 @@ class ReleaseUpgraderTest(LandscapeTest)
+         deferred = Deferred()
+ 
+         def do_test():
+-
+             result = self.upgrader.upgrade("karmic", 100)
+ 
+             def check_result(ignored):
+@@ -356,10 +361,12 @@ class ReleaseUpgraderTest(LandscapeTest)
+         deferred = Deferred()
+ 
+         def do_test():
+-
+-            result = self.upgrader.upgrade("karmic", 100,
+-                                           allow_third_party=True,
+-                                           debug=True)
++            result = self.upgrader.upgrade(
++                "karmic",
++                100,
++                allow_third_party=True,
++                debug=True,
++            )
+ 
+             def check_result(ignored):
+                 result_text = (u"=== Standard output ===\n\n"
+@@ -402,7 +409,6 @@ class ReleaseUpgraderTest(LandscapeTest)
+         deferred = Deferred()
+ 
+         def do_test():
+-
+             result = self.upgrader.upgrade("karmic", 100)
+ 
+             def check_result(ignored):
+@@ -458,7 +464,6 @@ class ReleaseUpgraderTest(LandscapeTest)
+         deferred = Deferred()
+ 
+         def do_test():
+-
+             result = self.upgrader.upgrade("karmic", 100)
+ 
+             def kill_child(how):
+@@ -650,8 +655,9 @@ class ReleaseUpgraderTest(LandscapeTest)
+         self.upgrader.upgrade = upgrade
+         self.upgrader.finish = finish
+ 
+-        self.upgrader.lsb_release_filename = self.makeFile(
+-            "DISTRIB_CODENAME=jaunty\n")
++        self.upgrader.os_release_filename = self.makeFile(
++            "VERSION_CODENAME=jaunty\n",
++        )
+ 
+         message = {"type": "release-upgrade",
+                    "code-name": "karmic",
+@@ -674,8 +680,9 @@ class ReleaseUpgraderTest(LandscapeTest)
+         The L{ReleaseUpgrader.handle_release_upgrade} method reports a
+         failure if the system is already running the desired release.
+         """
+-        self.upgrader.lsb_release_filename = self.makeFile(
+-            "DISTRIB_CODENAME=karmic\n")
++        self.upgrader.os_release_filename = self.makeFile(
++            "VERSION_CODENAME=karmic\n",
++        )
+ 
+         message = {"type": "release-upgrade",
+                    "code-name": "karmic",
+@@ -703,8 +710,9 @@ class ReleaseUpgraderTest(LandscapeTest)
+         The L{ReleaseUpgrader.handle_release_upgrade} method reports a
+         failure if any of the helper method errbacks.
+         """
+-        self.upgrader.lsb_release_filename = self.makeFile(
+-            "DISTRIB_CODENAME=jaunty\n")
++        self.upgrader.os_release_filename = self.makeFile(
++            "VERSION_CODENAME=jaunty\n",
++        )
+ 
+         calls = []
+ 
+Index: landscape-client/landscape/client/package/tests/test_reporter.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/tests/test_reporter.py
++++ landscape-client/landscape/client/package/tests/test_reporter.py
+@@ -46,7 +46,6 @@ class PackageReporterConfigurationTest(L
+ 
+ 
+ class PackageReporterAptTest(LandscapeTest):
+-
+     helpers = [AptFacadeHelper, SimpleRepositoryHelper, BrokerServiceHelper]
+ 
+     Facade = AptFacade
+@@ -124,10 +123,10 @@ class PackageReporterAptTest(LandscapeTe
+         return deferred.addCallback(got_result)
+ 
+     def test_set_package_ids_with_unknown_request_id(self):
+-
+-        self.store.add_task("reporter",
+-                            {"type": "package-ids", "ids": [123, 456],
+-                             "request-id": 123})
++        self.store.add_task(
++            "reporter",
++            {"type": "package-ids", "ids": [123, 456], "request-id": 123},
++        )
+ 
+         # Nothing bad should happen.
+         return self.reporter.handle_tasks()
+@@ -299,7 +298,6 @@ class PackageReporterAptTest(LandscapeTe
+                 return_value=succeed(b"hash-ids"))
+     @mock.patch("logging.info", return_value=None)
+     def test_fetch_hash_id_db(self, logging_mock, mock_fetch_async):
+-
+         # Assume package_hash_id_url is set
+         self.config.data_path = self.makeDir()
+         self.config.package_hash_id_url = "http://fake.url/path/"
+@@ -310,7 +308,7 @@ class PackageReporterAptTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Let's say fetch_async is successful
+@@ -346,7 +344,7 @@ class PackageReporterAptTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Let's say fetch_async is successful
+@@ -362,7 +360,6 @@ class PackageReporterAptTest(LandscapeTe
+ 
+     @mock.patch("landscape.client.package.reporter.fetch_async")
+     def test_fetch_hash_id_db_does_not_download_twice(self, mock_fetch_async):
+-
+         # Let's say that the hash=>id database is already there
+         self.config.package_hash_id_url = "http://fake.url/path/"
+         self.config.data_path = self.makeDir()
+@@ -374,7 +371,7 @@ class PackageReporterAptTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         result = self.reporter.fetch_hash_id_db()
+@@ -407,28 +404,27 @@ class PackageReporterAptTest(LandscapeTe
+ 
+     @mock.patch("logging.warning", return_value=None)
+     def test_fetch_hash_id_db_undetermined_codename(self, logging_mock):
+-
+         # Fake uuid
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+ 
+         # Undetermined codename
+-        self.reporter.lsb_release_filename = self.makeFile("Foo=bar")
++        self.reporter.os_release_filename = self.makeFile("Foo=bar")
+ 
+         result = self.reporter.fetch_hash_id_db()
+ 
+         logging_mock.assert_called_once_with(
+             "Couldn't determine which hash=>id database to use: "
+-            "missing code-name key in %s" % self.reporter.lsb_release_filename)
++            f"missing code-name key in {self.reporter.os_release_filename}",
++        )
+         return result
+ 
+     @mock.patch("logging.warning", return_value=None)
+     def test_fetch_hash_id_db_undetermined_arch(self, logging_mock):
+-
+         # Fake uuid and codename
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+ 
+         # Undetermined arch
+         self.facade.set_arch("")
+@@ -453,7 +449,7 @@ class PackageReporterAptTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Check fetch_async is called with the default url
+@@ -474,8 +470,10 @@ class PackageReporterAptTest(LandscapeTe
+                 return_value=fail(FetchError("fetch error")))
+     @mock.patch("logging.warning", return_value=None)
+     def test_fetch_hash_id_db_with_download_error(
+-            self, logging_mock, mock_fetch_async):
+-
++        self,
++        logging_mock,
++        mock_fetch_async,
++    ):
+         # Assume package_hash_id_url is set
+         self.config.data_path = self.makeDir()
+         self.config.package_hash_id_url = "http://fake.url/path/"
+@@ -483,7 +481,7 @@ class PackageReporterAptTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Let's say fetch_async fails
+@@ -507,7 +505,6 @@ class PackageReporterAptTest(LandscapeTe
+ 
+     @mock.patch("logging.warning", return_value=None)
+     def test_fetch_hash_id_db_with_undetermined_url(self, logging_mock):
+-
+         # We don't know where to fetch the hash=>id database from
+         self.config.url = None
+         self.config.package_hash_id_url = None
+@@ -515,7 +512,7 @@ class PackageReporterAptTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         result = self.reporter.fetch_hash_id_db()
+@@ -546,7 +543,7 @@ class PackageReporterAptTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.reporter.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.reporter.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Check fetch_async is called with the default url
+@@ -1004,10 +1001,12 @@ class PackageReporterAptTest(LandscapeTe
+         """Packages versions coming from security are reported as such."""
+         message_store = self.broker_service.message_store
+         message_store.set_accepted_types(["packages"])
+-        lsb = parse_lsb_release(LSB_RELEASE_FILENAME)
++        os_release_info = parse_os_release(OS_RELEASE_FILENAME)
+         release_path = os.path.join(self.repository_dir, "Release")
+         with open(release_path, "w") as release:
+-            release.write("Suite: {}-security".format(lsb["code-name"]))
++            release.write(
++                "Suite: {}-security".format(os_release_info["code-name"]),
++            )
+ 
+         self.store.set_hash_ids({HASH1: 1, HASH2: 2, HASH3: 3})
+ 
+@@ -1051,10 +1050,12 @@ class PackageReporterAptTest(LandscapeTe
+         message_store = self.broker_service.message_store
+         message_store.set_accepted_types(["packages"])
+ 
+-        lsb = parse_lsb_release(LSB_RELEASE_FILENAME)
++        os_release_info = parse_os_release(OS_RELEASE_FILENAME)
+         release_path = os.path.join(self.repository_dir, "Release")
+         with open(release_path, "w") as release:
+-            release.write("Suite: {}-backports".format(lsb["code-name"]))
++            release.write(
++                "Suite: {}-backports".format(os_release_info["code-name"]),
++            )
+ 
+         self.store.set_hash_ids({HASH1: 1, HASH2: 2, HASH3: 3})
+ 
+@@ -1125,10 +1126,12 @@ class PackageReporterAptTest(LandscapeTe
+         os.remove(os.path.join(other_backport_dir, "Packages"))
+         self.facade.add_channel_deb_dir(other_backport_dir)
+ 
+-        lsb = parse_lsb_release(LSB_RELEASE_FILENAME)
++        os_release_info = parse_os_release(OS_RELEASE_FILENAME)
+         official_release_path = os.path.join(self.repository_dir, "Release")
+         with open(official_release_path, "w") as release:
+-            release.write("Suite: {}-backports".format(lsb["code-name"]))
++            release.write(
++                "Suite: {}-backports".format(os_release_info["code-name"]),
++            )
+         unofficial_release_path = os.path.join(other_backport_dir, "Release")
+         with open(unofficial_release_path, "w") as release:
+             release.write("Suite: my-personal-backports")
+@@ -1315,8 +1318,8 @@ class PackageReporterAptTest(LandscapeTe
+         deferred = self.reporter.run()
+         self.reactor.advance(0)
+         with mock.patch(
+-            "landscape.client.package.taskhandler.parse_lsb_release",
+-            side_effect=lambda _: {"code-name": "codename"}
++            "landscape.client.package.taskhandler.parse_os_release",
++            side_effect=lambda _: {"code-name": "codename"},
+         ):
+             yield deferred
+ 
+@@ -1999,7 +2002,6 @@ class PackageReporterAptTest(LandscapeTe
+ 
+ 
+ class GlobalPackageReporterAptTest(LandscapeTest):
+-
+     helpers = [AptFacadeHelper, SimpleRepositoryHelper, BrokerServiceHelper]
+ 
+     def setUp(self):
+@@ -2049,7 +2051,6 @@ class GlobalPackageReporterAptTest(Lands
+ 
+ 
+ class FakePackageReporterTest(LandscapeTest):
+-
+     helpers = [EnvironSaverHelper, BrokerServiceHelper]
+ 
+     def setUp(self):
+Index: landscape-client/landscape/client/package/tests/test_taskhandler.py
+===================================================================
+--- landscape-client.orig/landscape/client/package/tests/test_taskhandler.py
++++ landscape-client/landscape/client/package/tests/test_taskhandler.py
+@@ -1,23 +1,31 @@
+ import os
+-from subprocess import CalledProcessError
+-
+-from mock import patch, Mock, ANY
+-
+-from twisted.internet.defer import Deferred, fail, succeed
++from unittest.mock import ANY
++from unittest.mock import Mock
++from unittest.mock import patch
++
++from twisted.internet.defer import Deferred
++from twisted.internet.defer import fail
++from twisted.internet.defer import succeed
+ 
++from landscape.client.broker.amp import RemoteBrokerConnector
++from landscape.client.package.taskhandler import LazyRemoteBroker
++from landscape.client.package.taskhandler import PackageTaskHandler
++from landscape.client.package.taskhandler import (
++    PackageTaskHandlerConfiguration,
++)
++from landscape.client.package.taskhandler import run_task_handler
++from landscape.client.tests.helpers import BrokerServiceHelper
++from landscape.client.tests.helpers import LandscapeTest
+ from landscape.lib.apt.package.facade import AptFacade
+-from landscape.lib.apt.package.store import HashIdStore, PackageStore
++from landscape.lib.apt.package.store import HashIdStore
++from landscape.lib.apt.package.store import PackageStore
+ from landscape.lib.apt.package.testing import AptFacadeHelper
+ from landscape.lib.lock import lock_path
+-from landscape.lib.testing import EnvironSaverHelper, FakeReactor
+-from landscape.client.broker.amp import RemoteBrokerConnector
+-from landscape.client.package.taskhandler import (
+-    PackageTaskHandlerConfiguration, PackageTaskHandler, run_task_handler,
+-    LazyRemoteBroker)
+-from landscape.client.tests.helpers import LandscapeTest, BrokerServiceHelper
++from landscape.lib.testing import EnvironSaverHelper
++from landscape.lib.testing import FakeReactor
+ 
+ 
+-SAMPLE_LSB_RELEASE = "DISTRIB_CODENAME=codename\n"
++SAMPLE_OS_RELEASE = "VERSION_CODENAME=codename\n"
+ 
+ 
+ class PackageTaskHandlerConfigurationTest(LandscapeTest):
+@@ -34,7 +42,6 @@ class PackageTaskHandlerConfigurationTes
+ 
+ 
+ class PackageTaskHandlerTest(LandscapeTest):
+-
+     helpers = [AptFacadeHelper, EnvironSaverHelper, BrokerServiceHelper]
+ 
+     def setUp(self):
+@@ -46,7 +53,6 @@ class PackageTaskHandlerTest(LandscapeTe
+             self.store, self.facade, self.remote, self.config, self.reactor)
+ 
+     def test_use_hash_id_db(self):
+-
+         # We don't have this hash=>id mapping
+         self.assertEqual(self.store.get_hash_id(b"hash"), None)
+ 
+@@ -60,7 +66,7 @@ class PackageTaskHandlerTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.handler.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.handler.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Attach the hash=>id database to our store
+@@ -75,13 +81,12 @@ class PackageTaskHandlerTest(LandscapeTe
+ 
+     @patch("logging.warning")
+     def test_use_hash_id_db_undetermined_codename(self, logging_mock):
+-
+         # Fake uuid
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+ 
+         # Undetermined codename
+-        self.handler.lsb_release_filename = self.makeFile("Foo=bar")
++        self.handler.os_release_filename = self.makeFile("Foo=bar")
+ 
+         # Go!
+         result = self.handler.use_hash_id_db()
+@@ -89,30 +94,29 @@ class PackageTaskHandlerTest(LandscapeTe
+         # The failure should be properly logged
+         logging_mock.assert_called_with(
+             "Couldn't determine which hash=>id database to use: "
+-            "missing code-name key in %s" % self.handler.lsb_release_filename)
++            f"missing code-name key in {self.handler.os_release_filename}",
++        )
+ 
+         return result
+ 
+     @patch("logging.warning")
+-    def test_use_hash_id_db_wit_non_existing_lsb_release(self, logging_mock):
+-
++    def test_use_hash_id_db_with_non_existing_os_release(self, logging_mock):
+         # Fake uuid
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+ 
+-        # Undetermined codename
+-        self.handler.lsb_release_filename = self.makeFile()
++        # Undetermined os release filename
++        self.handler.os_release_filename = ""
+ 
+         # Go!
+-        with patch("landscape.lib.lsb_release.check_output") as co_mock:
+-            co_mock.side_effect = CalledProcessError(127, "")
+-            result = self.handler.use_hash_id_db()
++        result = self.handler.use_hash_id_db()
+ 
+         # The failure should be properly logged
+         logging_mock.assert_called_with(
+             "Couldn't determine which hash=>id database to use: "
+-            "[Errno 2] No such file or directory: '%s'" %
+-            self.handler.lsb_release_filename)
++            "[Errno 2] No such file or directory: "
++            f"'{self.handler.os_release_filename}'",
++        )
+ 
+         return result
+ 
+@@ -165,11 +169,10 @@ class PackageTaskHandlerTest(LandscapeTe
+ 
+     @patch("logging.warning")
+     def test_use_hash_id_db_undetermined_arch(self, logging_mock):
+-
+         # Fake uuid and codename
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.handler.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.handler.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+ 
+         # Undetermined arch
+         self.facade.set_arch(None)
+@@ -185,14 +188,13 @@ class PackageTaskHandlerTest(LandscapeTe
+         return result
+ 
+     def test_use_hash_id_db_database_not_found(self):
+-
+         # Clean path, we don't have an appropriate hash=>id database
+         self.config.data_path = self.makeDir()
+ 
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.handler.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.handler.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Let's try
+@@ -207,7 +209,6 @@ class PackageTaskHandlerTest(LandscapeTe
+ 
+     @patch("logging.warning")
+     def test_use_hash_id_with_invalid_database(self, logging_mock):
+-
+         # Let's say the appropriate database is actually garbage
+         self.config.data_path = self.makeDir()
+         os.makedirs(os.path.join(self.config.data_path, "package", "hash-id"))
+@@ -218,7 +219,7 @@ class PackageTaskHandlerTest(LandscapeTe
+         # Fake uuid, codename and arch
+         message_store = self.broker_service.message_store
+         message_store.set_server_uuid("uuid")
+-        self.handler.lsb_release_filename = self.makeFile(SAMPLE_LSB_RELEASE)
++        self.handler.os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
+         self.facade.set_arch("arch")
+ 
+         # Try to attach it
+@@ -362,7 +363,6 @@ class PackageTaskHandlerTest(LandscapeTe
+         reactor_mock.run.side_effect = lambda: call_when_running[0]()
+ 
+         def assert_task_handler(ignored):
+-
+             store, facade, broker, config, reactor = handler_args
+ 
+             # Verify the arguments passed to the reporter constructor.
+@@ -405,7 +405,6 @@ class PackageTaskHandlerTest(LandscapeTe
+         return result.addCallback(assert_task_handler)
+ 
+     def test_run_task_handler_when_already_locked(self):
+-
+         lock_path(os.path.join(self.data_path, "package", "default.lock"))
+ 
+         try:
+@@ -453,7 +452,6 @@ class PackageTaskHandlerTest(LandscapeTe
+ 
+ 
+ class LazyRemoteBrokerTest(LandscapeTest):
+-
+     helpers = [BrokerServiceHelper]
+ 
+     def test_wb_is_lazy(self):
+Index: landscape-client/landscape/lib/lsb_release.py
+===================================================================
+--- landscape-client.orig/landscape/lib/lsb_release.py
++++ /dev/null
+@@ -1,59 +0,0 @@
+-"""Get information from /usr/bin/lsb_release."""
+-import os
+-from subprocess import CalledProcessError, check_output
+-
+-LSB_RELEASE = "/usr/bin/lsb_release"
+-LSB_RELEASE_FILENAME = "/etc/lsb_release"
+-LSB_RELEASE_FILE_KEYS = {
+-    "DISTRIB_ID": "distributor-id",
+-    "DISTRIB_DESCRIPTION": "description",
+-    "DISTRIB_RELEASE": "release",
+-    "DISTRIB_CODENAME": "code-name",
+-}
+-
+-
+-def parse_lsb_release(lsb_release_filename=None):
+-    """
+-    Returns a C{dict} holding information about the system LSB release.
+-    Reads from C{lsb_release_filename} if it exists, else calls
+-    C{LSB_RELEASE}
+-    """
+-    if lsb_release_filename and os.path.exists(lsb_release_filename):
+-        return parse_lsb_release_file(lsb_release_filename)
+-
+-    with open(os.devnull, 'w') as FNULL:
+-        try:
+-            lsb_info = check_output([LSB_RELEASE, "-as"], stderr=FNULL)
+-        except (CalledProcessError, FileNotFoundError):
+-            # Fall back to reading file, even if it doesn't exist.
+-            return parse_lsb_release_file(lsb_release_filename)
+-        else:
+-            dist, desc, release, code_name, _ = lsb_info.decode().split("\n")
+-
+-            return {
+-                "distributor-id": dist,
+-                "release": release,
+-                "code-name": code_name,
+-                "description": desc,
+-            }
+-
+-
+-def parse_lsb_release_file(filename):
+-    """
+-    Returns a C{dict} holding information about the system LSB release
+-    by attempting to parse C{filename}.
+-
+-    @raises: A FileNotFoundError if C{filename} does not exist.
+-    """
+-    info = {}
+-
+-    with open(filename) as fd:
+-        for line in fd:
+-            key, value = line.split("=")
+-
+-            if key in LSB_RELEASE_FILE_KEYS:
+-                key = LSB_RELEASE_FILE_KEYS[key.strip()]
+-                value = value.strip().strip('"')
+-                info[key] = value
+-
+-    return info
+Index: landscape-client/landscape/lib/os_release.py
+===================================================================
+--- /dev/null
++++ landscape-client/landscape/lib/os_release.py
+@@ -0,0 +1,43 @@
++"""Get information from os-release."""
++import os
++
++OS_RELEASE_FILENAME = "/etc/os-release"
++OS_RELEASE_FILENAME_FALLBACK = "/usr/lib/os-release"
++OS_RELEASE_FILE_KEYS = {
++    "NAME": "distributor-id",
++    "PRETTY_NAME": "description",
++    "VERSION_ID": "release",
++    "VERSION_CODENAME": "code-name",
++}
++
++
++def parse_os_release(os_release_filename=None):
++    """
++    Returns a C{dict} holding information about the system LSB release
++    by attempting to parse C{os_release_filename} if specified. If no
++    filename is provided /etc/os-release will be used or
++    /usr/lib/os-release as a fallback as indicated in os-release
++    at Freedesktop.org
++
++    @raises: A FileNotFoundError if C{filename} does not exist.
++    """
++    info = {}
++
++    if os_release_filename is None:
++        os_release_filename = OS_RELEASE_FILENAME
++        if not os.path.exists(os_release_filename) or not os.access(
++            os_release_filename,
++            os.R_OK,
++        ):
++            os_release_filename = OS_RELEASE_FILENAME_FALLBACK
++
++    with open(os_release_filename) as fd:
++        for line in fd:
++            key, value = line.split("=")
++
++            if key in OS_RELEASE_FILE_KEYS:
++                key = OS_RELEASE_FILE_KEYS[key.strip()]
++                value = value.strip().strip('"')
++                info[key] = value
++
++    return info
+Index: landscape-client/landscape/lib/tests/test_lsb_release.py
+===================================================================
+--- landscape-client.orig/landscape/lib/tests/test_lsb_release.py
++++ /dev/null
+@@ -1,75 +0,0 @@
+-import unittest
+-from subprocess import CalledProcessError
+-from unittest import mock
+-
+-from landscape.lib import testing
+-from landscape.lib.lsb_release import parse_lsb_release
+-
+-
+-class LsbReleaseTest(testing.FSTestCase, unittest.TestCase):
+-
+-    def test_parse_lsb_release(self):
+-        with mock.patch("landscape.lib.lsb_release.check_output") as co_mock:
+-            co_mock.return_value = (b"Ubuntu\nUbuntu 22.04.1 LTS\n22.04\njammy"
+-                                    b"\n")
+-            lsb_release = parse_lsb_release()
+-
+-        self.assertEqual(lsb_release,
+-                         {"distributor-id": "Ubuntu",
+-                          "description": "Ubuntu 22.04.1 LTS",
+-                          "release": "22.04",
+-                          "code-name": "jammy"})
+-
+-    def test_parse_lsb_release_debian(self):
+-        with mock.patch("landscape.lib.lsb_release.check_output") as co_mock:
+-            co_mock.return_value = (b"Debian\nDebian GNU/Linux 11 (bullseye)\n"
+-                                    b"11\nbullseye\n")
+-            lsb_release = parse_lsb_release()
+-
+-        self.assertEqual(lsb_release,
+-                         {"distributor-id": "Debian",
+-                          "description": "Debian GNU/Linux 11 (bullseye)",
+-                          "release": "11",
+-                          "code-name": "bullseye"})
+-
+-    def test_parse_lsb_release_file(self):
+-        """
+-        L{parse_lsb_release} returns a C{dict} holding information from
+-        the given LSB release file.
+-        """
+-        lsb_release_filename = self.makeFile("DISTRIB_ID=Ubuntu\n"
+-                                             "DISTRIB_RELEASE=6.06\n"
+-                                             "DISTRIB_CODENAME=dapper\n"
+-                                             "DISTRIB_DESCRIPTION="
+-                                             "\"Ubuntu 6.06.1 LTS\"\n")
+-
+-        with mock.patch("landscape.lib.lsb_release.check_output") as co_mock:
+-            co_mock.side_effect = CalledProcessError(127, "")
+-            lsb_release = parse_lsb_release(lsb_release_filename)
+-
+-        self.assertEqual(lsb_release,
+-                         {"distributor-id": "Ubuntu",
+-                          "description": "Ubuntu 6.06.1 LTS",
+-                          "release": "6.06",
+-                          "code-name": "dapper"})
+-
+-    def test_parse_lsb_release_file_with_missing_or_extra_fields(self):
+-        """
+-        L{parse_lsb_release} ignores lines not matching the map of
+-        known keys, and returns only keys with an actual value.
+-        """
+-        lsb_release_filename = self.makeFile("DISTRIB_ID=Ubuntu\n"
+-                                             "FOO=Bar\n")
+-
+-        with mock.patch("landscape.lib.lsb_release.check_output") as co_mock:
+-            co_mock.side_effect = CalledProcessError(127, "")
+-            lsb_release = parse_lsb_release(lsb_release_filename)
+-
+-        self.assertEqual(lsb_release, {"distributor-id": "Ubuntu"})
+-
+-    def test_parse_lsb_release_file_not_found(self):
+-        with mock.patch("landscape.lib.lsb_release.check_output") as co_mock:
+-            co_mock.side_effect = CalledProcessError(127, "")
+-
+-            self.assertRaises(FileNotFoundError, parse_lsb_release,
+-                              "TheresNoWayThisFileExists")
+Index: landscape-client/landscape/lib/tests/test_os_release.py
+===================================================================
+--- /dev/null
++++ landscape-client/landscape/lib/tests/test_os_release.py
+@@ -0,0 +1,137 @@
++import unittest
++from unittest import mock
++
++from landscape.lib import testing
++from landscape.lib.os_release import parse_os_release
++
++SAMPLE_OS_RELEASE = """PRETTY_NAME="Ubuntu 22.04.3 LTS"
++NAME="Ubuntu"
++VERSION_ID="22.04"
++VERSION="22.04.3 LTS (Jammy Jellyfish)"
++VERSION_CODENAME=codename
++ID=ubuntu
++ID_LIKE=debian
++HOME_URL="https://www.ubuntu.com/"
++SUPPORT_URL="https://help.ubuntu.com/"
++BUG_REPORT_URL="https://bugs.launchpad.net/ubuntu/"
++PRIVACY_POLICY_URL="https://www.ubuntu.com/legal/terms-and-policies/privacy-policy"
++UBUNTU_CODENAME=codename
++"""
++
++
++class OsReleaseTest(testing.FSTestCase, unittest.TestCase):
++    def test_parse_os_release(self):
++        """
++        L{parse_os_release} ignores lines not matching the map of
++        known keys, and returns only keys with an actual value. By
++        default it reads from OS_RELEASE_FILENAME if no other path
++        is provided.
++        """
++
++        os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
++
++        with mock.patch(
++            "landscape.lib.os_release.OS_RELEASE_FILENAME",
++            new=os_release_filename,
++        ):
++            os_release = parse_os_release()
++
++        self.assertEqual(
++            os_release,
++            {
++                "code-name": "codename",
++                "description": "Ubuntu 22.04.3 LTS",
++                "distributor-id": "Ubuntu",
++                "release": "22.04",
++            },
++        )
++
++    def test_parse_os_release_no_etc(self):
++        """
++        L{parse_os_release} ignores lines not matching the map of
++        known keys, and returns only keys with an actual value. By
++        default it reads from OS_RELEASE_FILENAME if no other path
++        is provided and it should read from SAMPLE_OS_RELEASE_FALLBACK
++        path if there OS_RELEASE_FILENAME doesn't exists.
++        """
++
++        os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
++
++        with mock.patch("os.path.exists") as co_mock:
++            co_mock.return_value = False
++
++            with mock.patch(
++                "landscape.lib.os_release.OS_RELEASE_FILENAME_FALLBACK",
++                new=os_release_filename,
++            ):
++                os_release = parse_os_release()
++
++        self.assertEqual(
++            os_release,
++            {
++                "code-name": "codename",
++                "description": "Ubuntu 22.04.3 LTS",
++                "distributor-id": "Ubuntu",
++                "release": "22.04",
++            },
++        )
++
++    def test_parse_os_release_no_perms(self):
++        """
++        L{parse_os_release} ignores lines not matching the map of
++        known keys, and returns only keys with an actual value. By
++        default it reads from OS_RELEASE_FILENAME if no other path
++        is provided and it should read from SAMPLE_OS_RELEASE_FALLBACK
++        path if there OS_RELEASE_FILENAME is not readable.
++        """
++
++        os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
++
++        with mock.patch("os.access") as co_mock:
++            co_mock.return_value = False
++
++            with mock.patch(
++                "landscape.lib.os_release.OS_RELEASE_FILENAME_FALLBACK",
++                new=os_release_filename,
++            ):
++                os_release = parse_os_release()
++
++        self.assertEqual(
++            os_release,
++            {
++                "code-name": "codename",
++                "description": "Ubuntu 22.04.3 LTS",
++                "distributor-id": "Ubuntu",
++                "release": "22.04",
++            },
++        )
++
++    def test_parse_os_release_with_file(self):
++        """
++        L{parse_os_release} returns a C{dict} holding information from
++        the given OS release file.
++        """
++        os_release_filename = self.makeFile(SAMPLE_OS_RELEASE)
++        os_release = parse_os_release(os_release_filename)
++
++        self.assertEqual(
++            os_release,
++            {
++                "distributor-id": "Ubuntu",
++                "description": "Ubuntu 22.04.3 LTS",
++                "release": "22.04",
++                "code-name": "codename",
++            },
++        )
++
++    def test_parse_os_release_with_file_not_found(self):
++        """
++        L{parse_os_release} should fail with FileNotFound
++        if given OS release file doesn't exists.
++        """
++
++        self.assertRaises(
++            FileNotFoundError,
++            parse_os_release,
++            "TheresNoWayThisFileExists",
++        )
diff --git a/debian/patches/series b/debian/patches/series
index 1d2050f..f0e339b 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 0001-start-service-during-config.patch
 add-non-filtered-interfaces-to-the-api-response.patch
 0002-fix-locale-error.patch
+package-reporter-high-cpu.patch
+parse-lsb-output.patch