Merge ~mitchburton/ubuntu/+source/landscape-client:2020064-fix-locale-error-focal into ubuntu/+source/landscape-client:ubuntu/focal-devel

[Mitch Burton]

[Simon Quigley (tsimonq2)]

review: Approve

Unmerged commits

d6b59c5... by Mitch Burton on 2024-12-19

release for focal

2b874b6... by Mitch Burton on 2024-12-19

d/p/0002-fix-locale-error.patch: revert previous fix for LP: #1827857

diff --git a/debian/changelog b/debian/changelog
index 3b78974..86246ae 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+landscape-client (23.02-0ubuntu1~20.04.5) focal; urgency=medium
+
+  * d/p/0002-fix-locale-error.path: revert previous fix for #1827857, as
+    it has been fixed in the dependency package python3-apt. Reverting this
+    fix fixes package-reporter when some locales are missing. (LP: #2020064)
+
+ -- Mitch Burton <[e-mail]>  Wed, 18 Dec 2024 16:06:43 -0800
+
 landscape-client (23.02-0ubuntu1~20.04.4) focal; urgency=medium
 
   * d/p/add-non-filtered-interfaces-to-the-api-response.patch: include
diff --git a/debian/patches/0002-fix-locale-error.patch b/debian/patches/0002-fix-locale-error.patch
new file mode 100644
index 0000000..102ff9d
--- /dev/null
+++ b/debian/patches/0002-fix-locale-error.patch
@@ -0,0 +1,102 @@
+Description: revert previous fix for LP: #1827857
+ The fix was implemented in python3-apt >= 2.0.0. The changes in landscape-client now
+ cause issues with package reporter on machines with certain locale configurations.
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/landscape-client/+bug/2020064
+Author: Mitch Burton <[e-mail]>
+Origin: backport, https://github.com/canonical/landscape-client/commit/1cbf5e0466287a9bd9acafff9c048c834328ac24
+Applied-Upstream: 24.11
+Last-Update: 2024-12-17
+---
+This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
+--- a/landscape/client/package/reporter.py
++++ b/landscape/client/package/reporter.py
+@@ -3,7 +3,6 @@
+ except ImportError:
+     import urllib.parse as urlparse
+ 
+-import locale
+ import logging
+ import time
+ import os
+@@ -867,10 +866,6 @@
+ 
+ 
+ def main(args):
+-    # Force UTF-8 encoding only for the reporter, thus allowing libapt-pkg to
+-    # return unmangled descriptions.
+-    locale.setlocale(locale.LC_CTYPE, ("C", "UTF-8"))
+-
+     if "FAKE_GLOBAL_PACKAGE_STORE" in os.environ:
+         return run_task_handler(FakeGlobalReporter, args)
+     elif "FAKE_PACKAGE_STORE" in os.environ:
+--- a/landscape/client/package/tests/test_reporter.py
++++ b/landscape/client/package/tests/test_reporter.py
+@@ -1,4 +1,3 @@
+-import locale
+ import sys
+ import os
+ import time
+@@ -1232,31 +1231,6 @@
+             self.assertEqual("RESULT", main(["ARGS"]))
+         m.assert_called_once_with(PackageReporter, ["ARGS"])
+ 
+-    def test_main_resets_locale(self):
+-        """
+-        Reporter entry point should reset encoding to utf-8, as libapt-pkg
+-        encodes description with system encoding and python-apt decodes
+-        them as utf-8 (LP: #1827857).
+-        """
+-        self._add_package_to_deb_dir(
+-            self.repository_dir, "gosa", description=u"GOsa\u00B2")
+-        self.facade.reload_channels()
+-
+-        # Set the only non-utf8 locale which we're sure exists.
+-        # It behaves slightly differently than the bug, but fails on the
+-        # same condition.
+-        locale.setlocale(locale.LC_CTYPE, (None, None))
+-        self.addCleanup(locale.resetlocale)
+-
+-        with mock.patch("landscape.client.package.reporter.run_task_handler"):
+-            main([])
+-
+-        # With the actual package, the failure will occur looking up the
+-        # description translation.
+-        pkg = self.facade.get_packages_by_name("gosa")[0]
+-        skel = self.facade.get_package_skeleton(pkg, with_info=True)
+-        self.assertEqual(u"GOsa\u00B2", skel.description)
+-
+     def test_find_reporter_command_with_bindir(self):
+         self.config.bindir = "/spam/eggs"
+         command = find_reporter_command(self.config)
+--- a/landscape/lib/apt/package/tests/test_skeleton.py
++++ b/landscape/lib/apt/package/tests/test_skeleton.py
+@@ -1,4 +1,3 @@
+-import locale
+ import unittest
+ 
+ from landscape.lib import testing
+@@ -148,22 +147,15 @@
+     def test_build_skeleton_with_unicode_and_non_ascii(self):
+         """
+         If with_unicode and with_info are passed to build_skeleton_apt,
+-        the description is decoded.
++        the description is decoded and non-ascii chars replaced.
+         """
+-        # Py2 used to convert to lossy ascii (thus LC_ in Makefile)
+-        # Py3 doesn't, and python3-apt assumes UTF8 (LP: #1827857).
+-        # If you revisit this test, also check reporter.main(), which
+-        # should set this globally to the reporter process.
+-        locale.setlocale(locale.LC_CTYPE, "C.UTF-8")
+-        self.addCleanup(locale.resetlocale)
+-
+         self._add_package_to_deb_dir(
+             self.skeleton_repository_dir, "pkg", description=u"T\xe9st")
+         self.facade._cache.update(None)
+         self.facade._cache.open(None)
+         pkg = self.get_package("pkg")
+         skeleton = build_skeleton_apt(pkg, with_unicode=True, with_info=True)
+-        self.assertEqual(u"T\u00E9st", skeleton.description)
++        self.assertEqual("T?st", skeleton.description)
+ 
+     def test_build_skeleton_minimal(self):
+         """
diff --git a/debian/patches/series b/debian/patches/series
index 6c61034..1d2050f 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 0001-start-service-during-config.patch
 add-non-filtered-interfaces-to-the-api-response.patch
+0002-fix-locale-error.patch