Merge ~nteodosio/update-manager:jammy-ua into update-manager:ubuntu/jammy

[Nathan Teodosio]

Fix failed autopkgtests.

Failed: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy/jammy/amd64/u/update-manager/20231004_063955_6936b@/log.gz
Fixed: https://autopkgtest.ubuntu.com/results/autopkgtest-jammy-nteodosio-ubuntu-pro/jammy/amd64/u/update-manager/20231004_132228_79afc@/log.gz

[Sebastien Bacher (seb128)]

Thanks and sorry for not catching that before upload!

[Sebastien Bacher (seb128)]

It was merged into https://git.launchpad.net/update-manager/log/?h=ubuntu/jammy but launchpad didn't detect it since the target vcs there was the git-ubuntu import one, marking manually as merged now

diff --git a/UpdateManager/Core/UpdateList.py b/UpdateManager/Core/UpdateList.py
index 8d30317..814d772 100644
--- a/UpdateManager/Core/UpdateList.py
+++ b/UpdateManager/Core/UpdateList.py
@@ -391,7 +391,8 @@ class UpdateList():
                 return True
         return False
 
-    def _make_groups(self, cache, pkgs, eventloop_callback, to_remove=False, sensitive=True):
+    def _make_groups(self, cache, pkgs, eventloop_callback, to_remove=False,
+                     sensitive=True):
         if not pkgs:
             return []
         ungrouped_pkgs = []
@@ -401,7 +402,8 @@ class UpdateList():
         for pkg in pkgs:
             app = self._get_application_for_package(pkg)
             if app is not None:
-                app_group = UpdateApplicationGroup(pkg, app, to_remove, sensitive)
+                app_group = UpdateApplicationGroup(pkg, app, to_remove,
+                                                   sensitive)
                 app_groups.append(app_group)
             else:
                 ungrouped_pkgs.append(pkg)
@@ -440,7 +442,8 @@ class UpdateList():
                            "linux-doc.*")
             linux_regexp = re.compile("(" + "|".join(
                 ["^" + n for n in linux_names]) + ")")
-            ubuntu_base_group = UpdateGroup(None, None, None, to_remove, sensitive)
+            ubuntu_base_group = UpdateGroup(None, None, None, to_remove,
+                                            sensitive)
             flavor_package = utils.get_ubuntu_flavor_package(cache=cache)
             ubuntu_base_pkgs = [flavor_package,
                                 "ubuntu-standard",
@@ -458,10 +461,13 @@ class UpdateList():
                 if ubuntu_base_group.is_dependency(pkg, cache,
                                                    eventloop_callback):
                     if system_group is None:
-                        system_group = UpdateSystemGroup(cache, to_remove, sensitive)
+                        system_group = UpdateSystemGroup(cache, to_remove,
+                                                         sensitive)
                     system_group.add(pkg)
                 else:
-                    pkg_groups.append(UpdatePackageGroup(pkg, to_remove, sensitive))
+                    pkg_groups.append(UpdatePackageGroup(
+                        pkg, to_remove, sensitive)
+                    )
 
         app_groups.sort(key=lambda a: a.name.lower())
         pkg_groups.sort(key=lambda a: a.name.lower())
@@ -511,7 +517,12 @@ class UpdateList():
                 pass
         fake_ua_packages = []
         ua_packages_names = []
-        for (package_name, version, size, downloadable) in ua_security_packages:
+        for (
+            package_name,
+            version,
+            size,
+            downloadable
+        ) in ua_security_packages:
             if downloadable:
                 ua_packages_names.append(package_name)
             else:
@@ -573,7 +584,11 @@ class UpdateList():
         if security_pkgs or upgrade_pkgs or pro_pkgs:
             # There's updates available. Initiate the desktop file cache.
             pkg_names = [p.name for p in
-                         pro_pkgs + security_pkgs + upgrade_pkgs + kernel_autoremove_pkgs + duplicate_pkgs]
+                         pro_pkgs
+                         + security_pkgs
+                         + upgrade_pkgs
+                         + kernel_autoremove_pkgs
+                         + duplicate_pkgs]
             self._populate_desktop_cache(pkg_names)
         self.oem_groups = self._make_groups(cache, oem_pkgs,
                                             eventloop_callback)
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 259c0e6..2b0af65 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -198,7 +198,7 @@ class UpdateManager(Gtk.Window):
         self._start_pane(None)
         sys.exit(0)
 
-    def show_settings(self, page_number = SoftwarePropertiesPage.updates):
+    def show_settings(self, page_number=SoftwarePropertiesPage.updates):
         cmd = ["/usr/bin/software-properties-gtk",
                "--open-tab", str(page_number)]
 
@@ -284,14 +284,21 @@ class UpdateManager(Gtk.Window):
                 time.sleep(0.05)
             s = json.load(p.stdout)
             for package in s.get('packages', []):
-                if package.get('service_name', '') == 'standard-security': continue
+                if package.get('service_name', '') == 'standard-security':
+                    continue
                 status = package.get('status', '')
-                if status == 'pending_attach' or status == 'pending_enable' or status == 'upgrade_available':
+                if (
+                    status == 'pending_attach'
+                    or status == 'pending_enable'
+                    or status == 'upgrade_available'
+                ):
                     name = package.get('package', '')
                     version = package.get('version', '')
                     size = package.get('download_size', 0)
                     downloadable = status == 'upgrade_available'
-                    self.ua_security_packages.append((name, version, size, downloadable))
+                    self.ua_security_packages.append(
+                        (name, version, size, downloadable)
+                    )
 
     def _make_available_pane(self, install_count, need_reboot=False,
                              cancelled_update=False, error_occurred=False):
diff --git a/UpdateManager/UpdatesAvailable.py b/UpdateManager/UpdatesAvailable.py
index add06fe..5d254fe 100644
--- a/UpdateManager/UpdatesAvailable.py
+++ b/UpdateManager/UpdatesAvailable.py
@@ -251,7 +251,7 @@ class UpdatesAvailable(InternalDialog):
         self.button_close = self.add_button(Gtk.STOCK_CANCEL,
                                             self.window_main.close)
         self.button_pro = self.add_button(_("Enable Ubuntu Pro..."),
-                                    self.on_button_pro_clicked)
+                                          self.on_button_pro_clicked)
         self.button_install = self.add_button(_("Install Now"),
                                               self.on_button_install_clicked)
         self.focus_button = self.button_install
@@ -371,8 +371,9 @@ class UpdatesAvailable(InternalDialog):
             from uaclient.api.u.apt_news.current_news.v1 import current_news
             apt_news = current_news().current_news
         except ImportError:
-            pro_client_apt_news_api_supported = False
-            apt_news = self._get_apt_news("/var/lib/ubuntu-advantage/messages/apt-news")
+            apt_news = self._get_apt_news(
+                "/var/lib/ubuntu-advantage/messages/apt-news"
+            )
         if apt_news:
             self.news.get_buffer().set_text(apt_news)
             self.expander_news.set_visible(True)
@@ -522,14 +523,16 @@ class UpdatesAvailable(InternalDialog):
 
         renderer.set_property("markup", markup)
 
-    def set_changes_buffer(self, changes_buffer, long_desc, text, name, srcpkg):
-        changes_buffer.set_text("") # Clear "downloading list of changes..."
+    def set_changes_buffer(self, changes_buffer, long_desc, text, name,
+                           srcpkg):
+        changes_buffer.set_text("")  # Clear "downloading list of changes..."
 
         # Write the technical description section
         changes_buffer.insert_with_tags_by_name(changes_buffer.get_end_iter(),
                                                 "Technical description\n",
                                                 "descriptiontag")
-        changes_buffer.insert(changes_buffer.get_end_iter(), long_desc + "\n\n")
+        changes_buffer.insert(changes_buffer.get_end_iter(),
+                              long_desc + "\n\n")
 
         # Write the changes section
         lines = text.split("\n")
@@ -604,7 +607,8 @@ class UpdatesAvailable(InternalDialog):
         if name in self.cache.all_changes:
             changes = self.cache.all_changes[name]
             srcpkg = self.cache[name].candidate.source_name
-            self.set_changes_buffer(changes_buffer, long_desc, changes, name, srcpkg)
+            self.set_changes_buffer(changes_buffer, long_desc, changes, name,
+                                    srcpkg)
         # if not connected, do not even attempt to get the changes
         elif not self.connected:
             changes_buffer.set_text(
@@ -651,7 +655,8 @@ class UpdatesAvailable(InternalDialog):
             changes += self.cache.all_changes[name]
 
         if changes or long_desc:
-            self.set_changes_buffer(changes_buffer, long_desc, changes, name, srcpkg)
+            self.set_changes_buffer(changes_buffer, long_desc, changes, name,
+                                    srcpkg)
 
     def on_treeview_button_press(self, widget, event):
         """
@@ -791,8 +796,10 @@ class UpdatesAvailable(InternalDialog):
                     self.button_install.set_sensitive(True)
                     self.unity.set_install_menuitem_visible(True)
                     self.button_pro.destroy()
-                elif self.list.ubuntu_pro_fake_groups and not self.list.ubuntu_pro_groups:
-                    download_str = _("You need to enable Ubuntu Pro to install these updates.")
+                elif (self.list.ubuntu_pro_fake_groups
+                      and not self.list.ubuntu_pro_groups):
+                    download_str = _("You need to enable Ubuntu Pro to install"
+                                     "these updates.")
                     self.button_install.destroy()
                 else:
                     download_str = _("There are no updates to install.")
@@ -1122,18 +1129,26 @@ class UpdatesAvailable(InternalDialog):
                 self.list.duplicate_groups)
             self._add_groups(self.list.duplicate_groups)
         if self.list.ubuntu_pro_groups:
-            self._add_header(_("Ubuntu Pro security updates"), self.list.ubuntu_pro_groups, sensitive=True)
+            self._add_header(
+                _("Ubuntu Pro security updates"),
+                self.list.ubuntu_pro_groups,
+                sensitive=True
+            )
             self._add_groups(self.list.ubuntu_pro_groups)
         if self.list.ubuntu_pro_fake_groups:
-            self._add_header(_("Ubuntu Pro security updates (enable in Settings…)"), self.list.ubuntu_pro_fake_groups, sensitive=False)
+            self._add_header(
+                _("Ubuntu Pro security updates (enable in Settings…)"),
+                self.list.ubuntu_pro_fake_groups,
+                sensitive=False
+            )
             self._add_groups(self.list.ubuntu_pro_fake_groups)
 
         self.treeview_update.set_model(self.store)
         self.pkg_cell_area.indent_toplevel = (
-            bool(self.list.ubuntu_pro_fake_groups) or
-            bool(self.list.ubuntu_pro_groups) or
-            bool(self.list.update_groups) or
-            bool(self.list.security_groups)
+            bool(self.list.ubuntu_pro_fake_groups)
+            or bool(self.list.ubuntu_pro_groups)
+            or bool(self.list.update_groups)
+            or bool(self.list.security_groups)
             or bool(self.list.kernel_autoremove_groups)
             or bool(self.list.duplicate_groups))
         self.update_close_button()
diff --git a/debian/changelog b/debian/changelog
index 749da13..1bf015b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+update-manager (1:22.04.15) UNRELEASED; urgency=medium
+
+  * Ubuntu Pro (LP: #1990450):
+    - Address linter errors that cause autopkgtest to fail.
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Wed, 04 Oct 2023 15:29:45 +0200
+
 update-manager (1:22.04.14) jammy; urgency=medium
 
   * Ubuntu Pro (LP: #1990450):