Merge ~nteodosio/update-manager:dont-nag-pro-focal into update-manager:main

[Nathan Teodosio]

Do not show the list of packages if the machine is not attached to Ubuntu Pro and only those coming from Ubuntu Pro are available.

Unmerged commits

e954fc2... by Nathan Teodosio on 2024-01-25

Update change log for version 1:20.04.10.20.

2ffb4b0... by Nathan Teodosio on 2024-01-25

Do not offer Ubuntu Pro if they are the only updates available.

928b535... by Nathan Teodosio on 2023-12-08

Update changelog.

eac8e4b... by Nathan Teodosio on 2023-12-08

Removed widgets added back to *.ui file.

Even though unused, updating Update Manager in place would otherwise cause
a crash.

LP:2045918

dfd9a81... by Sebastien Bacher on 2023-11-22

releasing package update-manager version 1:20.04.10.18

9020957... by Nathan Teodosio on 2023-11-15

Fix incorrect available version for Ubuntu Pro updates in unattached case.

LP:2043425

cacc1f3... by Sebastien Bacher on 2023-10-06

releasing package update-manager version 1:20.04.10.17

3b7747b... by Sebastien Bacher on 2023-10-06

* Ubuntu Pro (LP: #1990450):
  - fix another linter error which was created while fixing a missing
    space in the previous upload...

5a1ded2... by Sebastien Bacher on 2023-10-04

releasing package update-manager version 1:20.04.10.16

5926e16... by Nathan Teodosio on 2023-10-04

Prepare changelog for 1:20.04.10.16.

diff --git a/UpdateManager/Core/MyCache.py b/UpdateManager/Core/MyCache.py
index 80557c6..4bd0486 100644
--- a/UpdateManager/Core/MyCache.py
+++ b/UpdateManager/Core/MyCache.py
@@ -481,6 +481,7 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
         "get the changelog file from the changelog location"
         origins = self[name].candidate.origins
         version = self.pro_versions.get(name, self[name].candidate.version)
+<<<<<<< UpdateManager/Core/MyCache.py
         self.all_changes[name] = _(
             "Changes for %s versions:\n"
             "Installed version: %s\n"
@@ -490,6 +491,12 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
             getattr(self[name].installed, "version", None),
             version,
         )
+=======
+        self.all_changes[name] = _("Changes for %s versions:\n"
+                                   "Installed version: %s\n"
+                                   "Available version: %s\n\n") % \
+            (name, getattr(self[name].installed, "version", None), version)
+>>>>>>> UpdateManager/Core/MyCache.py
         if self.CHANGELOG_ORIGIN not in [o.origin for o in origins]:
             self._fetch_changelog_for_third_party_package(name, origins)
             return
diff --git a/UpdateManager/Core/UpdateList.py b/UpdateManager/Core/UpdateList.py
index 265ab90..4e904ed 100644
--- a/UpdateManager/Core/UpdateList.py
+++ b/UpdateManager/Core/UpdateList.py
@@ -43,7 +43,11 @@ from gi.repository import Gio
 from UpdateManager.Core import utils
 
 
+<<<<<<< UpdateManager/Core/UpdateList.py
 class UpdateItem:
+=======
+class UpdateItem():
+>>>>>>> UpdateManager/Core/UpdateList.py
     def __init__(self, pkg, name, icon, to_remove, sensitive=True):
         self.icon = icon
         self.name = name
@@ -76,6 +80,7 @@ class UpdateGroup(UpdateItem):
         all_items.extend(self._items)
         return sorted(all_items, key=lambda a: a.name.lower())
 
+<<<<<<< UpdateManager/Core/UpdateList.py
     def add(
         self,
         pkg,
@@ -84,6 +89,10 @@ class UpdateGroup(UpdateItem):
         to_remove=False,
         sensitive=True,
     ):
+=======
+    def add(self, pkg, cache=None, eventloop_callback=None, to_remove=False,
+            sensitive=True):
+>>>>>>> UpdateManager/Core/UpdateList.py
         name = utils.get_package_label(pkg)
         icon = Gio.ThemedIcon.new("package")
         self._items.add(UpdateItem(pkg, name, icon, to_remove, sensitive))
@@ -168,18 +177,28 @@ class UpdateApplicationGroup(UpdateGroup):
     def __init__(self, pkg, application, to_remove, sensitive=True):
         name = application.get_display_name()
         icon = application.get_icon()
+<<<<<<< UpdateManager/Core/UpdateList.py
         super(UpdateApplicationGroup, self).__init__(
             pkg, name, icon, to_remove, sensitive
         )
+=======
+        super(UpdateApplicationGroup, self).__init__(pkg, name, icon,
+                                                     to_remove, sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
 
 
 class UpdatePackageGroup(UpdateGroup):
     def __init__(self, pkg, to_remove, sensitive=True):
         name = utils.get_package_label(pkg)
         icon = Gio.ThemedIcon.new("package")
+<<<<<<< UpdateManager/Core/UpdateList.py
         super(UpdatePackageGroup, self).__init__(
             pkg, name, icon, to_remove, sensitive
         )
+=======
+        super(UpdatePackageGroup, self).__init__(pkg, name, icon, to_remove,
+                                                 sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
 
 
 class UpdateSystemGroup(UpdateGroup):
@@ -188,9 +207,14 @@ class UpdateSystemGroup(UpdateGroup):
         # the core components and packages.
         name = _("%s base") % utils.get_ubuntu_flavor_name(cache=cache)
         icon = Gio.ThemedIcon.new("distributor-logo")
+<<<<<<< UpdateManager/Core/UpdateList.py
         super(UpdateSystemGroup, self).__init__(
             None, name, icon, to_remove, sensitive
         )
+=======
+        super(UpdateSystemGroup, self).__init__(None, name, icon, to_remove,
+                                                sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
 
 
 class UpdateOrigin:
@@ -435,9 +459,14 @@ class UpdateList:
         for pkg in pkgs:
             app = self._get_application_for_package(pkg)
             if app is not None:
+<<<<<<< UpdateManager/Core/UpdateList.py
                 app_group = UpdateApplicationGroup(
                     pkg, app, to_remove, sensitive
                 )
+=======
+                app_group = UpdateApplicationGroup(pkg, app, to_remove,
+                                                   sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
                 app_groups.append(app_group)
             else:
                 ungrouped_pkgs.append(pkg)
@@ -458,6 +487,7 @@ class UpdateList:
         if ungrouped_pkgs:
             # Separate out system base packages. If we have already found an
             # application for all updates, don't bother.
+<<<<<<< UpdateManager/Core/UpdateList.py
             linux_names = (
                 "linux$",
                 "linux-.*-buildinfo.*",
@@ -488,6 +518,32 @@ class UpdateList:
                 "ubuntu-standard",
                 "ubuntu-minimal",
             ]
+=======
+            linux_names = ("linux$",
+                           "linux-.*-buildinfo.*",
+                           "linux-.*-dev.*",
+                           "linux-.*-generic.*",
+                           "linux-.*-headers.*",
+                           "linux-.*-hwe.*",
+                           "linux-.*-gcp.*",
+                           "linux-.*-kernel.*",
+                           "linux-.*-lowlatency.*",
+                           "linux-.*-modules.*",
+                           "linux-.*-raspi.*",
+                           "linux-.*-tools.*",
+                           "linux-.*-virtual.*",
+                           "linux-base.*",
+                           "linux-crashdump.*",
+                           "linux-doc.*")
+            linux_regexp = re.compile("(" + "|".join(
+                ["^" + n for n in linux_names]) + ")")
+            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",
+                                "ubuntu-minimal"]
+>>>>>>> UpdateManager/Core/UpdateList.py
             for pkg in cache:
                 if linux_regexp.match(pkg.name):
                     ubuntu_base_pkgs.append(pkg.name)
@@ -498,6 +554,7 @@ class UpdateList:
                     # which fixes LP: #1912718
                     ubuntu_base_group.add(cache[pkg])
             for pkg in ungrouped_pkgs:
+<<<<<<< UpdateManager/Core/UpdateList.py
                 if ubuntu_base_group.is_dependency(
                     pkg, cache, eventloop_callback
                 ):
@@ -509,6 +566,17 @@ class UpdateList:
                 else:
                     pkg_groups.append(
                         UpdatePackageGroup(pkg, to_remove, sensitive)
+=======
+                if ubuntu_base_group.is_dependency(pkg, cache,
+                                                   eventloop_callback):
+                    if system_group is None:
+                        system_group = UpdateSystemGroup(cache, to_remove,
+                                                         sensitive)
+                    system_group.add(pkg)
+                else:
+                    pkg_groups.append(UpdatePackageGroup(
+                        pkg, to_remove, sensitive)
+>>>>>>> UpdateManager/Core/UpdateList.py
                     )
 
         app_groups.sort(key=lambda a: a.name.lower())
@@ -518,6 +586,7 @@ class UpdateList:
 
         return app_groups + pkg_groups
 
+<<<<<<< UpdateManager/Core/UpdateList.py
     def update(
         self,
         cache,
@@ -525,6 +594,10 @@ class UpdateList:
         duplicate_packages=[],
         ua_security_packages=[],
     ):
+=======
+    def update(self, cache, eventloop_callback=None, duplicate_packages=[],
+               ua_security_packages=[]):
+>>>>>>> UpdateManager/Core/UpdateList.py
         self.held_back = []
 
         # do the upgrade
@@ -550,9 +623,14 @@ class UpdateList:
         class FakeUbuntuProPackage:
             def __init__(self, package_name, version, size):
                 self.name = package_name
+<<<<<<< UpdateManager/Core/UpdateList.py
                 self.candidate = FakeUbuntuProPackageCandidate(
                     package_name, version, size
                 )
+=======
+                self.candidate = FakeUbuntuProPackageCandidate(package_name,
+                                                               version, size)
+>>>>>>> UpdateManager/Core/UpdateList.py
                 self.marked_install = False
                 self.marked_upgrade = False
                 self.marked_delete = False
@@ -563,7 +641,10 @@ class UpdateList:
 
             def mark_delete(self):
                 pass
+<<<<<<< UpdateManager/Core/UpdateList.py
 
+=======
+>>>>>>> UpdateManager/Core/UpdateList.py
         fake_ua_packages = []
         ua_packages_names = []
         for (
@@ -575,9 +656,14 @@ class UpdateList:
             if downloadable:
                 ua_packages_names.append(package_name)
             else:
+<<<<<<< UpdateManager/Core/UpdateList.py
                 fake_ua_packages.append(
                     FakeUbuntuProPackage(package_name, version, size)
                 )
+=======
+                fake_ua_packages.append(FakeUbuntuProPackage(package_name,
+                                                             version, size))
+>>>>>>> UpdateManager/Core/UpdateList.py
 
         # Find all upgradable packages
         for pkg in cache:
@@ -600,7 +686,11 @@ class UpdateList:
                         self.ignored_phased_updates.append(pkg)
                         continue
 
+<<<<<<< UpdateManager/Core/UpdateList.py
                 if fnmatch.fnmatch(pkg.name, "oem-*-meta"):
+=======
+                if fnmatch.fnmatch(pkg.name, 'oem-*-meta'):
+>>>>>>> UpdateManager/Core/UpdateList.py
                     oem_pkgs.append(pkg)
                 comes_from_pro = pkg.name in ua_packages_names
                 if comes_from_pro:
@@ -636,6 +726,7 @@ class UpdateList:
 
         if security_pkgs or upgrade_pkgs or pro_pkgs:
             # There's updates available. Initiate the desktop file cache.
+<<<<<<< UpdateManager/Core/UpdateList.py
             pkg_names = [
                 p.name
                 for p in security_pkgs
@@ -654,10 +745,26 @@ class UpdateList:
         self.security_groups = self._make_groups(
             cache, security_pkgs, eventloop_callback
         )
+=======
+            pkg_names = [p.name for p in
+                         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)
+        self.update_groups = self._make_groups(cache, upgrade_pkgs,
+                                               eventloop_callback)
+        self.security_groups = self._make_groups(cache, security_pkgs,
+                                                 eventloop_callback)
+>>>>>>> UpdateManager/Core/UpdateList.py
         self.kernel_autoremove_groups = self._make_groups(
             cache, kernel_autoremove_pkgs, eventloop_callback, True
         )
         self.duplicate_groups = self._make_groups(
+<<<<<<< UpdateManager/Core/UpdateList.py
             cache, duplicate_pkgs, eventloop_callback, True
         )
         self.ubuntu_pro_fake_groups = self._make_groups(
@@ -666,3 +773,10 @@ class UpdateList:
         self.ubuntu_pro_groups = self._make_groups(
             cache, pro_pkgs, eventloop_callback
         )
+=======
+            cache, duplicate_pkgs, eventloop_callback, True)
+        self.ubuntu_pro_fake_groups = self._make_groups(
+            cache, fake_ua_packages, eventloop_callback, sensitive=False)
+        self.ubuntu_pro_groups = self._make_groups(
+            cache, pro_pkgs, eventloop_callback)
+>>>>>>> UpdateManager/Core/UpdateList.py
diff --git a/UpdateManager/Dialogs.py b/UpdateManager/Dialogs.py
index 304609c..8b1cbd1 100644
--- a/UpdateManager/Dialogs.py
+++ b/UpdateManager/Dialogs.py
@@ -159,6 +159,7 @@ class InternalDialog(BuilderDialog):
         self.set_desc(None)
 
         if not active:
+<<<<<<< UpdateManager/Dialogs.py
             if (
                 self._is_livepatch_supported()
                 and self.settings_button
@@ -171,6 +172,14 @@ class InternalDialog(BuilderDialog):
                         "secure between restarts."
                     )
                 )
+=======
+            if self._is_livepatch_supported() and \
+               self.settings_button and \
+               self.settings.get_int('launch-count') >= 4:
+                self.set_desc(_("<b>Tip:</b> You can use Livepatch with "
+                                "Ubuntu Pro to keep your computer more "
+                                "secure between restarts."))
+>>>>>>> UpdateManager/Dialogs.py
                 self.settings_button.set_label(_("Settings & Pro…"))
             return
 
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index efe654e..7a11ebc 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -37,6 +37,10 @@ warnings.filterwarnings(
 
 import distro_info
 import fnmatch
+<<<<<<< UpdateManager/UpdateManager.py
+=======
+import json
+>>>>>>> UpdateManager/UpdateManager.py
 import os
 import subprocess
 import sys
@@ -70,7 +74,12 @@ from .Core.MyCache import MyCache
 from .Core.roam import NetworkManagerHelper
 from .Core.UpdateList import UpdateList
 from .Core.utils import get_arch, get_dist, SoftwarePropertiesPage
+<<<<<<< UpdateManager/UpdateManager.py
 from .backend import InstallBackend, get_backend
+=======
+from .backend import (InstallBackend,
+                      get_backend)
+>>>>>>> UpdateManager/UpdateManager.py
 
 # file that signals if we need to reboot
 REBOOT_REQUIRED_FILE = "/var/run/reboot-required"
@@ -248,12 +257,19 @@ class UpdateManager(Gtk.Window):
         if self.cache is None:
             return
 
+<<<<<<< UpdateManager/UpdateManager.py
         pane = self._make_available_pane(
             self.cache.install_count + self.cache.del_count,
             os.path.exists(REBOOT_REQUIRED_FILE),
             cancelled_update,
             error_occurred,
         )
+=======
+        pane = self._make_available_pane(self.cache.install_count
+                                         + self.cache.del_count,
+                                         os.path.exists(REBOOT_REQUIRED_FILE),
+                                         cancelled_update, error_occurred)
+>>>>>>> UpdateManager/UpdateManager.py
         self._start_pane(pane)
 
     def _check_oem_metapackages(self):
@@ -262,18 +278,28 @@ class UpdateManager(Gtk.Window):
         lts = di.is_lts(codename)
         if not lts:
             return None
+<<<<<<< UpdateManager/UpdateManager.py
         OEM_PATH = os.path.join(
             GLib.get_user_runtime_dir(), "ubuntu-drivers-oem.package-list"
         )
+=======
+        OEM_PATH = os.path.join(GLib.get_user_runtime_dir(),
+                                "ubuntu-drivers-oem.package-list")
+>>>>>>> UpdateManager/UpdateManager.py
         if not os.path.exists(OEM_PATH):
             return None
 
         # Packages that aren't installed but apply to this system
+<<<<<<< UpdateManager/UpdateManager.py
         with open(OEM_PATH, "r") as f:
+=======
+        with open(OEM_PATH, 'r') as f:
+>>>>>>> UpdateManager/UpdateManager.py
             self.oem_metapackages |= set(f.read().splitlines())
 
         # Packages that are already installed
         for pkg in self.cache:
+<<<<<<< UpdateManager/UpdateManager.py
             if fnmatch.fnmatch(pkg.name, "oem-*-meta") and pkg.installed:
                 self.oem_metapackages.add(pkg)
 
@@ -318,15 +344,61 @@ class UpdateManager(Gtk.Window):
     ):
         self._check_hwe_support_status()
         if install_count != 0 or len(self.ua_security_packages) > 0:
+=======
+            if fnmatch.fnmatch(pkg.name, 'oem-*-meta') \
+               and pkg.installed:
+                self.oem_metapackages.add(pkg)
+
+    def _get_ua_security_status(self):
+        self.ua_security_packages = []
+        try:
+            p = subprocess.Popen(['pro', 'security-status', '--format=json'],
+                                 stdout=subprocess.PIPE)
+        except OSError:
+            pass
+        else:
+            while p.poll() is None:
+                while Gtk.events_pending():
+                    Gtk.main_iteration()
+                time.sleep(0.05)
+            s = json.load(p.stdout)
+            for package in s.get('packages', []):
+                if package.get('service_name', '') == 'standard-security':
+                    continue
+                status = package.get('status', '')
+                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.cache.create_pro_cache(self.ua_security_packages)
+
+    def _make_available_pane(self, install_count, need_reboot=False,
+                             cancelled_update=False, error_occurred=False):
+        self._check_hwe_support_status()
+        if install_count != 0:
+>>>>>>> UpdateManager/UpdateManager.py
             header = None
             desc = None
             if error_occurred:
                 desc = _("Some software couldn’t be checked for updates.")
             elif cancelled_update:
                 header = _("You stopped the check for updates.")
+<<<<<<< UpdateManager/UpdateManager.py
                 desc = _(
                     "Updated software is available from a previous check."
                 )
+=======
+                desc = _("Updated software is available from "
+                         "a previous check.")
+>>>>>>> UpdateManager/UpdateManager.py
             # Display HWE updates first as an old HWE stack is vulnerable
             elif self.hwe_replacement_packages:
                 return HWEUpgradeDialog(self)
@@ -450,22 +522,37 @@ class UpdateManager(Gtk.Window):
             self._start_pane(PartialUpgradeDialog(self))
             # we assert a clean cache
             header = _("Software index is broken")
+<<<<<<< UpdateManager/UpdateManager.py
             desc = _(
                 "It is impossible to install or remove any software. "
                 'Please use the package manager "Synaptic" or run '
                 '"sudo apt-get install -f" in a terminal to fix '
                 "this issue at first."
             )
+=======
+            desc = _("It is impossible to install or remove any software. "
+                     "Please use the package manager \"Synaptic\" or run "
+                     "\"sudo apt-get install -f\" in a terminal to fix "
+                     "this issue at first.")
+>>>>>>> UpdateManager/UpdateManager.py
             self.start_error(False, header, desc)
             return
         except SystemError as e:
             header = _("Could not initialize the package information")
+<<<<<<< UpdateManager/UpdateManager.py
             desc = _(
                 "An unresolvable problem occurred while "
                 "initializing the package information.\n\n"
                 "Please report this bug against the 'update-manager' "
                 "package and include the following error message:\n"
             ) + str(e)
+=======
+            desc = _("An unresolvable problem occurred while "
+                     "initializing the package information.\n\n"
+                     "Please report this bug against the 'update-manager' "
+                     "package and include the following error "
+                     "message:\n") + str(e)
+>>>>>>> UpdateManager/UpdateManager.py
             self.start_error(False, header, desc)
             return
 
@@ -489,12 +576,19 @@ class UpdateManager(Gtk.Window):
 
         self.update_list = UpdateList(self)
         try:
+<<<<<<< UpdateManager/UpdateManager.py
             self.update_list.update(
                 self.cache,
                 eventloop_callback=iterate,
                 duplicate_packages=self.duplicate_packages,
                 ua_security_packages=self.ua_security_packages,
             )
+=======
+            self.update_list.update(self.cache, eventloop_callback=iterate,
+                                    duplicate_packages=self.duplicate_packages,
+                                    ua_security_packages=self.
+                                    ua_security_packages)
+>>>>>>> UpdateManager/UpdateManager.py
         except SystemError as e:
             header = _("Could not calculate the upgrade")
             desc = _(
diff --git a/UpdateManager/UpdatesAvailable.py b/UpdateManager/UpdatesAvailable.py
index 75cfd33..f4f84ed 100644
--- a/UpdateManager/UpdatesAvailable.py
+++ b/UpdateManager/UpdatesAvailable.py
@@ -75,6 +75,7 @@ from .UnitySupport import UnitySupport
 # - screen reader does not say "Downloaded" for downloaded updates
 
 # list constants
+<<<<<<< UpdateManager/UpdatesAvailable.py
 (
     LIST_NAME,
     LIST_UPDATE_DATA,
@@ -82,6 +83,10 @@ from .UnitySupport import UnitySupport
     LIST_TOGGLE_ACTIVE,
     LIST_SENSITIVE,
 ) = range(5)
+=======
+(LIST_NAME, LIST_UPDATE_DATA, LIST_SIZE, LIST_TOGGLE_ACTIVE,
+ LIST_SENSITIVE) = range(5)
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
 # NetworkManager enums
 from .Core.roam import NetworkManagerHelper
@@ -256,6 +261,7 @@ class UpdatesAvailable(InternalDialog):
         #    self.button_help.set_sensitive(False)
 
         self.add_settings_button()
+<<<<<<< UpdateManager/UpdatesAvailable.py
         self.button_close = self.add_button(
             Gtk.STOCK_CANCEL, self.window_main.close
         )
@@ -265,6 +271,14 @@ class UpdatesAvailable(InternalDialog):
         self.button_install = self.add_button(
             _("Install Now"), self.on_button_install_clicked
         )
+=======
+        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.button_install = self.add_button(_("Install Now"),
+                                              self.on_button_install_clicked)
+>>>>>>> UpdateManager/UpdatesAvailable.py
         self.focus_button = self.button_install
 
         # create text view
@@ -310,6 +324,7 @@ class UpdatesAvailable(InternalDialog):
         pkg_toggle_renderer.set_property("ypad", 2)
         pkg_toggle_renderer.connect("toggled", self.on_update_toggled)
         pkg_column.pack_start(pkg_toggle_renderer, False)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         pkg_column.add_attribute(
             pkg_toggle_renderer, "active", LIST_TOGGLE_ACTIVE
         )
@@ -319,6 +334,14 @@ class UpdatesAvailable(InternalDialog):
         pkg_column.set_cell_data_func(
             pkg_toggle_renderer, self.pkg_toggle_renderer_data_func
         )
+=======
+        pkg_column.add_attribute(pkg_toggle_renderer,
+                                 'active', LIST_TOGGLE_ACTIVE)
+        pkg_column.add_attribute(pkg_toggle_renderer,
+                                 'sensitive', LIST_SENSITIVE)
+        pkg_column.set_cell_data_func(pkg_toggle_renderer,
+                                      self.pkg_toggle_renderer_data_func)
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
         pkg_icon_renderer = Gtk.CellRendererPixbuf()
         pkg_icon_renderer.set_property("ypad", 2)
@@ -346,7 +369,12 @@ class UpdatesAvailable(InternalDialog):
             _("Download"), size_renderer, text=LIST_SIZE
         )
         size_column.set_sizing(Gtk.TreeViewColumnSizing.AUTOSIZE)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         size_column.add_attribute(size_renderer, "sensitive", LIST_SENSITIVE)
+=======
+        size_column.add_attribute(size_renderer,
+                                  'sensitive', LIST_SENSITIVE)
+>>>>>>> UpdateManager/UpdatesAvailable.py
         self.treeview_update.append_column(size_column)
 
         self.treeview_update.set_headers_visible(True)
@@ -371,9 +399,14 @@ class UpdatesAvailable(InternalDialog):
             self.settings.get_boolean("show-details")
         )
         self.expander_details.connect("activate", self.pre_activate_details)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         self.expander_details.connect(
             "notify::expanded", self.activate_details
         )
+=======
+        self.expander_details.connect("notify::expanded",
+                                      self.activate_details)
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
         # If auto-updates are on, change cancel label
         self.notifier_settings = Gio.Settings.new("com.ubuntu.update-notifier")
@@ -401,6 +434,17 @@ class UpdatesAvailable(InternalDialog):
             self.news.get_buffer().set_text(apt_news)
             self.expander_news.set_visible(True)
 
+        try:
+            from uaclient.api.u.apt_news.current_news.v1 import current_news
+            apt_news = current_news().current_news
+        except ImportError:
+            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)
+
     def stop(self):
         InternalDialog.stop(self)
         self._save_state()
@@ -584,6 +628,7 @@ class UpdatesAvailable(InternalDialog):
                 version = version_match.group(1)
                 # upload_archive = version_match.group(2).strip()
                 version_text = _("Version %s: \n") % version
+<<<<<<< UpdateManager/UpdatesAvailable.py
                 changes_buffer.insert_with_tags_by_name(
                     end_iter, version_text, "versiontag"
                 )
@@ -592,6 +637,14 @@ class UpdatesAvailable(InternalDialog):
                     end_iter, line + "\n", "changestag"
                 )
             elif author_match:
+=======
+                changes_buffer.insert_with_tags_by_name(end_iter, version_text,
+                                                        "versiontag")
+            elif changes_match:
+                changes_buffer.insert_with_tags_by_name(end_iter, line + "\n",
+                                                        "changestag")
+            elif (author_match):
+>>>>>>> UpdateManager/UpdatesAvailable.py
                 pass
             else:
                 changes_buffer.insert(end_iter, line + "\n")
@@ -633,7 +686,10 @@ class UpdatesAvailable(InternalDialog):
         # replace all multiple spaces by newlines
         p = re.compile(r"\s\s+", re.MULTILINE)
         long_desc = p.sub("\n", long_desc)
+<<<<<<< UpdateManager/UpdatesAvailable.py
         long_desc = "Package: %s\n%s" % (item.pkg.name, long_desc)
+=======
+>>>>>>> UpdateManager/UpdatesAvailable.py
 
         # now do the changelog
         name = item.pkg.name
@@ -851,8 +907,13 @@ class UpdatesAvailable(InternalDialog):
                     self.button_pro.destroy()
                 elif (self.list.ubuntu_pro_fake_groups
                       and not self.list.ubuntu_pro_groups):
+<<<<<<< UpdateManager/UpdatesAvailable.py
                     download_str = _("You need to enable Ubuntu Pro to install"
                                      " these updates.")
+=======
+                    download_str = _("You need to enable Ubuntu Pro to "
+                                     "install these updates.")
+>>>>>>> UpdateManager/UpdatesAvailable.py
                     self.button_install.destroy()
                 else:
                     download_str = _("There are no updates to install.")
@@ -1140,7 +1201,11 @@ class UpdatesAvailable(InternalDialog):
             UpdateData(groups, None, None),
             humanize_size(total_size),
             True,
+<<<<<<< UpdateManager/UpdatesAvailable.py
             sensitive,
+=======
+            sensitive
+>>>>>>> UpdateManager/UpdatesAvailable.py
         ]
         return self.store.append(None, header_row)
 
@@ -1163,16 +1228,23 @@ class UpdatesAvailable(InternalDialog):
 
             if group.name == "Ubuntu base":
                 group.name = "System components"
+<<<<<<< UpdateManager/UpdatesAvailable.py
             name = group.name
             if len(group.items) > 1:
                 name = '%s (%d)' % (group.name, len(group.items))
 
+=======
+>>>>>>> UpdateManager/UpdatesAvailable.py
             group_row = [
                 name,
                 UpdateData(None, group, group_is_item),
                 humanize_size(group.get_total_size()),
                 True,
+<<<<<<< UpdateManager/UpdatesAvailable.py
                 group.sensitive,
+=======
+                group.sensitive
+>>>>>>> UpdateManager/UpdatesAvailable.py
             ]
             group_iter = self.store.append(None, group_row)
 
@@ -1184,7 +1256,11 @@ class UpdatesAvailable(InternalDialog):
                     UpdateData(None, None, item),
                     humanize_size(getattr(item.pkg.candidate, "size", 0)),
                     True,
+<<<<<<< UpdateManager/UpdatesAvailable.py
                     group.sensitive,
+=======
+                    group.sensitive
+>>>>>>> UpdateManager/UpdatesAvailable.py
                 ]
                 self.store.append(group_iter, item_row)
 
@@ -1203,9 +1279,14 @@ class UpdatesAvailable(InternalDialog):
 
         # add security and update groups to self.store
         if self.list.oem_groups:
+<<<<<<< UpdateManager/UpdatesAvailable.py
             self._add_header(
                 _("Improved hardware support"), self.list.oem_groups
             )
+=======
+            self._add_header(_("Improved hardware support"),
+                             self.list.oem_groups)
+>>>>>>> UpdateManager/UpdatesAvailable.py
             self._add_groups(self.list.oem_groups)
         if self.list.security_groups:
             self._add_header(_("Security updates"), self.list.security_groups)
diff --git a/UpdateManager/backend/InstallBackendAptdaemon.py b/UpdateManager/backend/InstallBackendAptdaemon.py
index 2959aa6..559faa7 100644
--- a/UpdateManager/backend/InstallBackendAptdaemon.py
+++ b/UpdateManager/backend/InstallBackendAptdaemon.py
@@ -7,6 +7,7 @@ from gi.repository import Gtk
 
 from aptdaemon import client, errors
 from defer import inline_callbacks
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
 from aptdaemon.gtk3widgets import (
     AptCancelButton,
     AptConfigFileConflictDialog,
@@ -25,6 +26,22 @@ from aptdaemon.enums import (
     get_error_string_from_enum,
     get_status_string_from_enum,
 )
+=======
+from aptdaemon.gtk3widgets import (AptCancelButton,
+                                   AptConfigFileConflictDialog,
+                                   AptDetailsExpander,
+                                   AptMediumRequiredDialog,
+                                   AptProgressBar)
+from aptdaemon.enums import (EXIT_SUCCESS,
+                             EXIT_FAILED,
+                             STATUS_COMMITTING,
+                             STATUS_DOWNLOADING,
+                             STATUS_DOWNLOADING_REPO,
+                             STATUS_FINISHED,
+                             get_error_description_from_enum,
+                             get_error_string_from_enum,
+                             get_status_string_from_enum)
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
 
 from UpdateManager.backend import InstallBackend
 from UpdateManager.UnitySupport import UnitySupport
@@ -39,10 +56,17 @@ import os
 class UpdateManagerExpander(AptDetailsExpander):
     """An AptDetailsExpander which can be used with multiple terminals.
 
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
     The default AptDetailsExpander will shrink/hide when its transaction
     finishes. But here we want to support "chaining" transactions. So we
     override the status-changed handler to only do that when we are
     running the final transaction."""
+=======
+       The default AptDetailsExpander will shrink/hide when its transaction
+       finishes. But here we want to support "chaining" transactions. So we
+       override the status-changed handler to only do that when we are
+       running the final transaction."""
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
 
     def __init__(self, transaction, terminal=True, final=False):
         super().__init__(transaction, terminal)
@@ -71,7 +95,11 @@ class UpdateManagerExpander(AptDetailsExpander):
 
 
 class AptStackedProgressBar(Gtk.ProgressBar):
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
     """A GtkProgressBar which represents the state of many aptdaemon
+=======
+    """ A GtkProgressBar which represents the state of many aptdaemon
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
     transactions.
 
     aptdaemon provides AptProgressBar for the state of *one* transaction to
@@ -322,12 +350,130 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
             )
             raise
 
+    def _show_transaction_error(self, trans, action):
+        error_string = get_error_string_from_enum(trans.error.code)
+        error_desc = get_error_description_from_enum(trans.error.code)
+        if self.trans_failed_msg:
+            trans_failed = True
+            error_desc = error_desc + "\n" + self.trans_failed_msg
+        else:
+            trans_failed = None
+        self._action_done(action,
+                          authorized=True, success=False,
+                          error_string=error_string,
+                          error_desc=error_desc,
+                          trans_failed=trans_failed)
+
+    def _update_next_package(self, trans, status, action):
+        if status == EXIT_FAILED:
+            self._show_transaction_error(trans, action)
+            return
+        self._apt_update_oem()
+
+    @inline_callbacks
+    def _apt_update_oem(self):
+        assert self._oem_packages_to_update
+        elem = self._oem_packages_to_update.pop()
+        sources_list_file = f'/etc/apt/sources.list.d/{elem}.list'
+
+        try:
+            if os.path.exists(sources_list_file):
+                trans = yield self.client.update_cache(
+                    sources_list=sources_list_file
+                )
+                if self._oem_packages_to_update:
+                    finished_handler = self._update_next_package
+                else:
+                    finished_handler = self._on_finished
+
+                yield self._show_transaction(
+                    trans,
+                    self.ACTION_PRE_INSTALL,
+                    _("Installing updates…"), True,
+                    on_finished_handler=finished_handler,
+                    progress_bar_max=0.1 / self._len_oem_updates
+                )
+        except errors.NotAuthorizedError:
+            self._action_done(self.ACTION_PRE_INSTALL,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
+        except errors.TransactionFailed as e:
+            self.trans_failed_msg = str(e)
+        except dbus.DBusException as e:
+            if e.get_dbus_name() != "org.freedesktop.DBus.Error.NoReply":
+                raise
+            self._action_done(self.ACTION_PRE_INSTALL,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
+        except Exception:
+            self._action_done(self.ACTION_PRE_INSTALL,
+                              authorized=True, success=False,
+                              error_string=None, error_desc=None)
+            raise
+
+    def _update_oem(self, trans, status, action):
+        # This is the "finished" handler of installing an oem metapackage
+        # What we do now is:
+        #  1. update_cache() for the new sources.lists only
+
+        if status == EXIT_FAILED:
+            self._show_transaction_error(trans, action)
+            return
+
+        (install, _, _, _, _, _) = trans.packages
+
+        self._oem_packages_to_update = set(install)
+        self._len_oem_updates = len(install)
+
+        self._apt_update_oem()
+
+    @inline_callbacks
+    def commit_oem(self, pkgs_install_oem, pkgs_upgrade_oem):
+        self.all_oem_packages = set(pkgs_install_oem) | set(pkgs_upgrade_oem)
+        # Nothing to do? Go to the regular updates.
+        try:
+            if not pkgs_install_oem and not pkgs_upgrade_oem:
+                self._action_done(self.ACTION_PRE_INSTALL,
+                                  authorized=True, success=True,
+                                  error_string=None, error_desc=None,
+                                  trans_failed=None)
+                return
+
+            if pkgs_install_oem:
+                trans = yield self.client.install_packages(pkgs_install_oem,
+                                                           defer=True)
+                yield self._show_transaction(
+                    trans,
+                    self.ACTION_PRE_INSTALL,
+                    _("Installing updates…"), True,
+                    on_finished_handler=self._update_oem,
+                    progress_bar_max=0.1
+                )
+        except errors.NotAuthorizedError:
+            self._action_done(self.ACTION_PRE_INSTALL,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
+        except errors.TransactionFailed as e:
+            self.trans_failed_msg = str(e)
+        except dbus.DBusException as e:
+            if e.get_dbus_name() != "org.freedesktop.DBus.Error.NoReply":
+                raise
+            self._action_done(self.ACTION_PRE_INSTALL,
+                              authorized=False, success=False,
+                              error_string=None, error_desc=None)
+        except Exception:
+            self._action_done(self.ACTION_PRE_INSTALL,
+                              authorized=True, success=False,
+                              error_string=None, error_desc=None)
+            raise
+
     @inline_callbacks
     def commit(self, pkgs_install, pkgs_upgrade, pkgs_remove):
         """Commit a list of package adds and removes"""
         try:
             reinstall = purge = downgrade = []
             trans = yield self.client.commit_packages(
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
                 pkgs_install,
                 reinstall,
                 pkgs_remove,
@@ -339,6 +485,12 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
             yield self._show_transaction(
                 trans, self.ACTION_INSTALL, _("Installing updates…"), True
             )
+=======
+                pkgs_install, reinstall, pkgs_remove, purge, pkgs_upgrade,
+                downgrade, defer=True)
+            yield self._show_transaction(trans, self.ACTION_INSTALL,
+                                         _("Installing updates…"), True)
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
         except errors.NotAuthorizedError:
             self._action_done(
                 self.ACTION_INSTALL,
@@ -377,6 +529,7 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
         label_details.set_label(get_status_string_from_enum(status))
         # Also resize the window if we switch from download details to
         # the terminal window
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
         if (
             status == STATUS_COMMITTING
             and self._expander
@@ -394,6 +547,16 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
         progress_bar_max=1,
         on_finished_handler=None,
     ):
+=======
+        if status == STATUS_COMMITTING and self._expander \
+           and self._expander.terminal.get_visible():
+            self._resize_to_show_details(self._expander)
+
+    @inline_callbacks
+    def _show_transaction(self, trans, action, header, show_details,
+                          progress_bar_max=1,
+                          on_finished_handler=None):
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
 
         if on_finished_handler is None:
             on_finished_handler = self._on_finished
@@ -423,7 +586,12 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
                 self._expander.set_vexpand(True)
                 self._expander.set_hexpand(True)
                 self._expander.show_all()
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
                 self._expander.connect("notify::expanded", self._on_expanded)
+=======
+                self._expander.connect("notify::expanded",
+                                       self._on_expanded)
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
                 self.expander_slot.add(self._expander)
                 self.expander_slot.show()
             else:
@@ -432,6 +600,7 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
         elif self._expander:
             self._expander_slot.hide()
 
+<<<<<<< UpdateManager/backend/InstallBackendAptdaemon.py
         trans.connect(
             "status-details-changed",
             self._on_details_changed,
@@ -440,6 +609,12 @@ class InstallBackendAptdaemon(InstallBackend, BuilderDialog):
         trans.connect(
             "status-changed", self._on_status_changed, self.label_details
         )
+=======
+        trans.connect("status-details-changed", self._on_details_changed,
+                      self.label_details)
+        trans.connect("status-changed", self._on_status_changed,
+                      self.label_details)
+>>>>>>> UpdateManager/backend/InstallBackendAptdaemon.py
         trans.connect("finished", on_finished_handler, action)
         trans.connect("medium-required", self._on_medium_required)
         trans.connect("config-file-conflict", self._on_config_file_conflict)
diff --git a/UpdateManager/backend/__init__.py b/UpdateManager/backend/__init__.py
index 72a6031..66a950f 100644
--- a/UpdateManager/backend/__init__.py
+++ b/UpdateManager/backend/__init__.py
@@ -50,9 +50,17 @@ class InstallBackend(Dialog):
                 unfresh_pkg = unfresh_cache[pkg]
                 fresh_pkg = fresh_cache[pkg]
 
+<<<<<<< UpdateManager/backend/__init__.py
                 if unfresh_pkg.marked_install and not fresh_pkg.is_installed:
                     pkgs_install_oem.append(pkg)
                 elif unfresh_pkg.marked_upgrade and fresh_pkg.is_upgradable:
+=======
+                if (unfresh_pkg.marked_install
+                        and not fresh_pkg.is_installed):
+                    pkgs_install_oem.append(pkg)
+                elif (unfresh_pkg.marked_upgrade
+                      and fresh_pkg.is_upgradable):
+>>>>>>> UpdateManager/backend/__init__.py
                     pkgs_upgrade_oem.append(pkg)
             self.commit_oem(pkgs_install_oem, pkgs_upgrade_oem)
         elif self.action == self.ACTION_INSTALL:
@@ -95,6 +103,7 @@ class InstallBackend(Dialog):
         raise NotImplementedError
 
     def commit_oem(self, pkgs_install_oem, pkgs_upgrade_oem):
+<<<<<<< UpdateManager/backend/__init__.py
         """Install these OEM packages"""
         self._action_done(
             self.ACTION_PRE_INSTALL,
@@ -104,6 +113,13 @@ class InstallBackend(Dialog):
             error_desc=None,
             trans_failed=None,
         )
+=======
+        """ Install these OEM packages """
+        self._action_done(self.ACTION_PRE_INSTALL,
+                          authorized=True, success=True,
+                          error_string=None, error_desc=None,
+                          trans_failed=None)
+>>>>>>> UpdateManager/backend/__init__.py
 
     def commit(self, pkgs_install, pkgs_upgrade, pkgs_remove):
         """Commit the cache changes"""
@@ -379,18 +395,27 @@ class InstallBackend(Dialog):
         # close_after_install = settings.get_boolean(
         #    "autoclose-install-window")
         # FIXME: confirm with mpt whether this should still be a setting
+<<<<<<< UpdateManager/backend/__init__.py
         # close_after_install = False
+=======
+        #close_after_install = False
+>>>>>>> UpdateManager/backend/__init__.py
 
         if action == self.ACTION_PRE_INSTALL and success:
             # Now do the regular updates
             self.action = self.ACTION_INSTALL
             self.start()
         elif action == self.ACTION_INSTALL:
+<<<<<<< UpdateManager/backend/__init__.py
             if (
                 success
                 and os.path.exists("/usr/bin/snap")
                 and hasattr(self, "pane_update_progress")
             ):
+=======
+            if (success and os.path.exists("/usr/bin/snap")
+               and hasattr(self, 'pane_update_progress')):
+>>>>>>> UpdateManager/backend/__init__.py
                 Thread(target=self.update_snaps).start()
             elif success:
                 self.window_main.start_available()
@@ -405,11 +430,16 @@ class InstallBackend(Dialog):
         else:
             if error_string:
                 self.window_main.start_error(True, error_string, error_desc)
+<<<<<<< UpdateManager/backend/__init__.py
             elif (
                 success
                 and os.path.exists("/usr/bin/snap")
                 and hasattr(self, "pane_update_progress")
             ):
+=======
+            elif (success and os.path.exists("/usr/bin/snap")
+                  and hasattr(self, 'pane_update_progress')):
+>>>>>>> UpdateManager/backend/__init__.py
                 self.window_main.duplicate_packages = self.get_deb2snap_dups()
                 self.window_main.start_available()
             else:
diff --git a/data/gtkbuilder/UpdateManager.ui b/data/gtkbuilder/UpdateManager.ui
index 39daaad..6b1747e 100644
--- a/data/gtkbuilder/UpdateManager.ui
+++ b/data/gtkbuilder/UpdateManager.ui
@@ -7,7 +7,11 @@
     <property name="spacing">12</property>
     <!--
     https://launchpad.net/bugs/2045918
+<<<<<<< data/gtkbuilder/UpdateManager.ui
     Old widgets from previous version need to be kept, even though invisible,
+=======
+    Old widgets from 20.04.9 need to be kept, even though invisible, because
+>>>>>>> data/gtkbuilder/UpdateManager.ui
     otherwise updating Update Manager itself via Update Manager will crash when
     Update Manager recalculates itself. That is because the old Update Manager
     file is still the being executed, whereas this ui file will be the new one.
diff --git a/debian/changelog b/debian/changelog
index d9b2db4..7fd23be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,4 @@
+<<<<<<< debian/changelog
 update-manager (1:24.04.4) UNRELEASED; urgency=low
 
   * d/control: Depend on ubuntu-advantage-tools >= 30~.
@@ -7,10 +8,22 @@ update-manager (1:24.04.4) UNRELEASED; urgency=low
  -- Nathan Pratta Teodosio <[e-mail]>  Mon, 22 Jan 2024 08:17:25 +0100
 
 update-manager (1:24.04.3) noble; urgency=medium
+=======
+update-manager (1:20.04.10.20) focal; urgency=medium
+
+  * The New Release dialog should take precedence over a list of updates dialog
+    if the latter would only show Ubuntu Pro updates in an unattached system.
+    (LP: #2051115).
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Thu, 25 Jan 2024 13:45:30 +0100
+
+update-manager (1:20.04.10.19) focal; urgency=medium
+>>>>>>> debian/changelog
 
   * Add back removed widgets to UI file to fix crash when updating
     Upgrade Manager from inside itself (LP: #2045918).
 
+<<<<<<< debian/changelog
  -- Nathan Pratta Teodosio <[e-mail]>  Fri, 08 Dec 2023 11:25:51 +0100
 
 update-manager (1:24.04.2) noble; urgency=medium
@@ -29,6 +42,33 @@ update-manager (1:24.04.1) noble; urgency=medium
  -- Nathan Pratta Teodosio <[e-mail]>  Wed, 15 Nov 2023 11:45:02 +0100
 
 update-manager (1:23.10.2) mantic; urgency=medium
+=======
+ -- Nathan Pratta Teodosio <[e-mail]>  Fri, 08 Dec 2023 15:37:42 +0100
+
+update-manager (1:20.04.10.18) focal; urgency=medium
+
+  * Fix incorrect available version for Ubuntu Pro updates in unattached case
+    (LP: #2043425).
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Wed, 15 Nov 2023 11:28:54 +0100
+
+update-manager (1:20.04.10.17) focal; urgency=medium
+
+  * Ubuntu Pro (LP: #1990450):
+    - fix another linter error which was created while fixing a missing
+      space in the previous upload...
+
+ -- Sebastien Bacher <[e-mail]>  Fri, 06 Oct 2023 11:56:51 +0200
+
+update-manager (1:20.04.10.16) focal; urgency=medium
+
+  * Ubuntu Pro (LP: #1990450):
+    - Address linter errors that cause autopkgtest to fail.
+
+ -- Nathan Pratta Teodosio <[e-mail]>  Wed, 04 Oct 2023 23:46:23 +0200
+
+update-manager (1:20.04.10.15) focal; urgency=medium
+>>>>>>> debian/changelog
 
   * Ubuntu Pro (LP: #1990450):
     - Show Ubuntu Pro packages, whether the system is attached to Ubuntu Pro
@@ -39,6 +79,7 @@ update-manager (1:23.10.2) mantic; urgency=medium
     - Add News pane in a expander.
     - Replace notebook with Description and Changes tabs by a pane.
 
+<<<<<<< debian/changelog
  -- Nathan Pratta Teodosio <[e-mail]>  Mon, 25 Sep 2023 17:03:10 +0200
 
 update-manager (1:23.10.1) mantic; urgency=medium
@@ -97,10 +138,35 @@ update-manager (1:22.10.4) kinetic; urgency=medium
  -- Steve Langasek <[e-mail]>  Sun, 16 Oct 2022 23:26:08 -0700
 
 update-manager (1:22.10.3) kinetic; urgency=medium
+=======
+ -- Nathan Pratta Teodosio <[e-mail]>  Tue, 29 Aug 2023 07:47:20 +0200
+
+update-manager (1:20.04.10.14) focal; urgency=medium
+
+  * Fix Ubuntu Pro updates checkbox and expander widget from overlapping
+    (LP: #1990450)
+
+ -- Robert Ancell <[e-mail]>  Fri, 03 Feb 2023 14:43:45 +1300
+
+update-manager (1:20.04.10.13) focal; urgency=medium
+
+  * Update of the parsing for pro client changes (lp: #1990450)
+
+ -- Sebastien Bacher <[e-mail]>  Thu, 26 Jan 2023 11:56:31 +0100
+
+update-manager (1:20.04.10.12) focal; urgency=medium
+
+  * Show pending Ubuntu pro packages (LP: #1990450)
+
+ -- Robert Ancell <[e-mail]>  Wed, 18 Jan 2023 15:03:27 +1300
+
+update-manager (1:20.04.10.11) focal; urgency=medium
+>>>>>>> debian/changelog
 
   [ Renan Rodrigo ]
   * ubuntu-security-status: Don't show ESM Apps information when the service
     is disabled, and prefer 'pro security-status' when it is available.
+<<<<<<< debian/changelog
 
  -- Steve Langasek <[e-mail]>  Mon, 03 Oct 2022 08:37:28 -0700
 
@@ -182,11 +248,28 @@ update-manager (1:22.04.1) jammy; urgency=medium
  -- Brian Murray <[e-mail]>  Mon, 18 Oct 2021 12:26:38 -0700
 
 update-manager (1:21.10.4) impish; urgency=medium
+=======
+    (LP: #1991533)
+
+ -- Brian Murray <[e-mail]>  Thu, 01 Dec 2022 11:10:57 -0800
+
+update-manager (1:20.04.10.10) focal; urgency=medium
+
+  * ubuntu-security-status: Check if ESM for Apps is enabled or if it is not
+    in beta before displaying information about the packages available from
+    there. Additionally, improve pluralization in a couple of locations.
+    (LP: #1955471)
+
+ -- Brian Murray <[e-mail]>  Fri, 14 Jan 2022 10:28:42 -0800
+
+update-manager (1:20.04.10.9) focal; urgency=medium
+>>>>>>> debian/changelog
 
   * ubuntu-security-status: use ubuntu-advantage-tools to determine whether or
     not livepatch or esm are enabled and if the system is attached. Thanks to
     Chad Smith for the patch. (LP: #1938043)
 
+<<<<<<< debian/changelog
  -- Brian Murray <[e-mail]>  Fri, 03 Sep 2021 14:43:22 -0700
 
 update-manager (1:21.10.3) impish; urgency=medium
@@ -277,11 +360,65 @@ update-manager (1:21.04.3) hirsute; urgency=medium
     (LP: #1807900)
   * UpdateManager/backend/__init__.py: Resolve unbound local error crash with
     oem package lists. Thanks to Thomas Bechtold for the patch.
+=======
+ -- Brian Murray <[e-mail]>  Fri, 03 Sep 2021 15:17:22 -0700
+
+update-manager (1:20.04.10.8) focal; urgency=medium
+
+  * tests/test_meta_release_core.py: switch a test from using lucid to bionic
+    as precise was removed from the archive. (LP: #1929865)
+
+ -- Brian Murray <[e-mail]>  Thu, 27 May 2021 13:36:54 -0700
+
+update-manager (1:20.04.10.7) focal; urgency=medium
+
+  * tests/test_update_list.py: rewrite how APT::VersionedKernelPackages is set.
+    (LP: #1924809)
+  * debian/tests/control: add apt to the list of Depends.
+
+ -- Brian Murray <[e-mail]>  Fri, 16 Apr 2021 16:25:21 -0700
+
+update-manager (1:20.04.10.6) focal; urgency=medium
+
+  * UpdateManager/Core/UpdateList.py: change to a regex from a static list
+    of packages to be grouped under Ubuntu Base (LP: #1902025)
+  * Clean up apt cache binary files left behind by tests
+  * Rename meta_pkgs to ubuntu_base_pkgs to make it more clear to the
+    reader which packages should be included
+  * Add tests in to ensure Ubuntu base packages are not grouped when
+    staged for removal (LP: #1912718)
+
+ -- William 'jawn-smith' Wilson <[e-mail]>  Wed, 10 Feb 2021 14:39:27 -0600
+
+update-manager (1:20.04.10.5) focal; urgency=medium
+
+  * UpdateManager/backend/__init__.py: Really make commit_oem a no-op in the
+    base class to avoid crash when people force synaptic backend (LP: #1913732)
+  * Fix typo in previous changelog
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 29 Jan 2021 17:43:01 +0100
+
+update-manager (1:20.04.10.4) focal; urgency=medium
+
+  * Revert previous change to UpdateList.py, as it breaks kernel
+    autoremoval (LP: #1912718)
+  * UpdateManager/backend/__init__.py: Make commit_oem a no-op in the base
+    class to avoid crash when people force synaptic backend (LP: #1913732)
+
+ -- Julian Andres Klode <[e-mail]>  Fri, 29 Jan 2021 12:50:23 +0100
+
+update-manager (1:20.04.10.3) focal; urgency=medium
+
+  [ Julian Andres Klode ]
+  * UpdateManager/backend/__init__.py: Fix unbound local variables regression
+    introduced by the previous SRU (See LP 1910556), and correct comment
+>>>>>>> debian/changelog
 
   [ William Wilson ]
   * UpdateManager/Core/UpdateList.py: change to a regex from a static list
     of packages to be grouped under Ubuntu Base (LP: #1902025)
 
+<<<<<<< debian/changelog
  -- Brian Murray <[e-mail]>  Fri, 08 Jan 2021 08:41:47 -0800
 
 update-manager (1:21.04.2) hirsute; urgency=medium
@@ -297,10 +434,16 @@ update-manager (1:21.04.1) hirsute; urgency=medium
   * UpdateManager/UpdatesAvailable.py: In the technical description portion of
     the Software Update window display the package name in the Description
     tab. Thanks to Jarkko Toivonen for the patch.
+=======
+ -- Brian Murray <[e-mail]>  Wed, 13 Jan 2021 08:35:58 -0800
+
+update-manager (1:20.04.10.2) focal; urgency=medium
+>>>>>>> debian/changelog
 
   [ Iain Lane & Julian Andres Klode ]
   * Support post install enablement of OEM-enabled devices (LP: #1908050)
 
+<<<<<<< debian/changelog
  -- Julian Andres Klode <[e-mail]>  Mon, 14 Dec 2020 11:32:03 +0100
 
 update-manager (1:20.10.1) groovy; urgency=medium
@@ -319,13 +462,25 @@ update-manager (1:20.04.12) groovy; urgency=medium
  -- Marcus Tomlinson <[e-mail]>  Thu, 28 May 2020 10:11:51 +0100
 
 update-manager (1:20.04.11) groovy; urgency=medium
+=======
+ -- Julian Andres Klode <[e-mail]>  Mon, 14 Dec 2020 12:24:18 +0100
+
+update-manager (1:20.04.10.1) focal; urgency=medium
+>>>>>>> debian/changelog
 
   * UpdateManager/UpdateManager.py: when refreshing the cache and encountering
     an error return rather than trying to use the undefined cache which causes
     crashes. Additionally, don't present the dialog with a "Try Again" button
     which won't do anything. (LP: #1826213)
+<<<<<<< debian/changelog
 
  -- Brian Murray <[e-mail]>  Wed, 27 May 2020 13:29:24 -0700
+=======
+  * Fix hang in apturl-gtk. (LP: #1874591)
+  * Fix crash in snap updates when refreshing the cache fails. (LP: #1880987)
+
+ -- Brian Murray <[e-mail]>  Wed, 03 Jun 2020 10:18:00 -0700
+>>>>>>> debian/changelog
 
 update-manager (1:20.04.10) focal; urgency=medium
 
diff --git a/debian/control b/debian/control
index 8acd880..27fbee5 100644
--- a/debian/control
+++ b/debian/control
@@ -23,6 +23,7 @@ XS-Testsuite: autopkgtest
 Package: update-manager-core
 Architecture: all
 Section: admin
+<<<<<<< debian/control
 Depends: distro-info-data,
          python3-distro-info,
          python3-update-manager (= ${source:Version}),
@@ -34,6 +35,20 @@ Recommends: libpam-modules (>= 1.0.1-9ubuntu3),
 Replaces: update-manager (<< 1:0.146.2),
 Breaks: computer-janitor (<= 1.11-0ubuntu1),
         update-manager (<< 1:0.146.2),
+=======
+Depends: ${python3:Depends},
+         ${misc:Depends},
+         python3-update-manager (= ${source:Version}),
+         python3-distro-info,
+         distro-info-data,
+         lsb-release,
+         ubuntu-release-upgrader-core (>= 1:18.04.9),
+         ubuntu-advantage-tools
+Recommends: libpam-modules (>= 1.0.1-9ubuntu3)
+Replaces: update-manager (<< 1:0.146.2)
+Breaks: update-manager (<< 1:0.146.2),
+        computer-janitor (<= 1.11-0ubuntu1)
+>>>>>>> debian/control
 Description: manage release upgrades
  This is the core of update-manager and the release upgrader
 
@@ -56,6 +71,7 @@ Description: Python 3.x module for update-manager
 
 Package: update-manager
 Architecture: all
+<<<<<<< debian/control
 Depends: gir1.2-gtk-3.0,
          gir1.2-handy-1 (>= 1.5.90),
          gir1.2-snapd-2,
@@ -64,17 +80,31 @@ Depends: gir1.2-gtk-3.0,
          pkexec,
          polkitd,
          python3-aptdaemon.gtk3widgets (>= 1.1.1+bzr982-0ubuntu13) | synaptic,
+=======
+Depends: ${python3:Depends}, ${misc:Depends},
+         update-manager-core (= ${source:Version}),
+         libgtk3-perl,
+         python3-aptdaemon.gtk3widgets (>= 1.1.1+bzr982-0ubuntu13) | synaptic,
+         policykit-1,
+>>>>>>> debian/control
          python3-dbus,
          python3-gi (>= 3.8),
          python3-yaml,
          ubuntu-release-upgrader-gtk,
          update-manager-core (= ${source:Version}),
          update-notifier,
+<<<<<<< debian/control
          ${misc:Depends},
          ${python3:Depends},
 Breaks: update-notifier (<< 3.177),
 Recommends: python3-launchpadlib,
             software-properties-gtk (>= 0.71.2),
+=======
+         gnome-shell | policykit-1-gnome | polkit-kde-agent-1 | lxpolkit | lxqt-policykit | mate-polkit | polkit-1-auth-agent
+Breaks: update-notifier (<< 3.177)
+Recommends: software-properties-gtk (>= 0.71.2),
+            python3-launchpadlib
+>>>>>>> debian/control
 Suggests: gir1.2-dbusmenu-glib-0.4,
           gir1.2-unity-5.0,
 Description: GNOME application that manages apt updates
diff --git a/debian/tests/control b/debian/tests/control
index 53f3d17..560af6e 100644
--- a/debian/tests/control
+++ b/debian/tests/control
@@ -1,4 +1,5 @@
 Tests: nose-tests
+<<<<<<< debian/tests/control
 Depends: apt,
          aptdaemon,
          pycodestyle,
@@ -7,3 +8,6 @@ Depends: apt,
          python3-nose,
          xvfb,
          @,
+=======
+Depends: @, apt, aptdaemon, pycodestyle, pyflakes3, python3-mock, python3-nose, xvfb
+>>>>>>> debian/tests/control
diff --git a/tests/test_cache.py b/tests/test_cache.py
index 432de84..f842e43 100644
--- a/tests/test_cache.py
+++ b/tests/test_cache.py
@@ -36,7 +36,12 @@ class TestCache(unittest.TestCase):
 
     def tearDown(self):
         try:
+<<<<<<< tests/test_cache.py
             shutil.rmtree(os.path.join(self.aptroot, "var/cache/apt"))
+=======
+            shutil.rmtree(os.path.join(self.aptroot,
+                          "var/cache/apt"))
+>>>>>>> tests/test_cache.py
         except OSError:
             pass
 
diff --git a/tests/test_changelog.py b/tests/test_changelog.py
index 41ced26..728fb29 100644
--- a/tests/test_changelog.py
+++ b/tests/test_changelog.py
@@ -7,6 +7,13 @@ import os
 import sys
 import unittest
 import glob
+<<<<<<< tests/test_changelog.py
+=======
+try:
+    from urllib.error import HTTPError
+except ImportError:
+    from urllib2 import HTTPError
+>>>>>>> tests/test_changelog.py
 
 from urllib.error import HTTPError
 from UpdateManager.Core.MyCache import MyCache
@@ -28,9 +35,14 @@ class TestChangelogs(unittest.TestCase):
 
         self.aptroot = os.path.join(CURDIR, "aptroot-changelog")
 
+<<<<<<< tests/test_changelog.py
         self.cache = MyCache(
             apt.progress.base.OpProgress(), rootdir=self.aptroot
         )
+=======
+        self.cache = MyCache(apt.progress.base.OpProgress(),
+                             rootdir=self.aptroot)
+>>>>>>> tests/test_changelog.py
         self.cache.open()
 
     def tearDown(self):
diff --git a/tests/test_meta_release_core.py b/tests/test_meta_release_core.py
index 954a0ba..7d15aa8 100644
--- a/tests/test_meta_release_core.py
+++ b/tests/test_meta_release_core.py
@@ -9,6 +9,14 @@ import os
 import random
 import sys
 import tempfile
+<<<<<<< tests/test_meta_release_core.py
+=======
+import glob
+try:
+    from test.support import EnvironmentVarGuard
+except ImportError:
+    from test.test_support import EnvironmentVarGuard
+>>>>>>> tests/test_meta_release_core.py
 import time
 import unittest
 
@@ -81,9 +89,15 @@ class TestMetaReleaseCore(unittest.TestCase):
         self.httpd_process.join()
         install_opener(None)
 
+<<<<<<< tests/test_meta_release_core.py
         bin_list = glob.glob(
             os.path.join(CURDIR, "aptroot-changelog/var/cache/apt/*.bin")
         )
+=======
+        bin_list = glob.glob(os.path.join(CURDIR,
+                                          "aptroot-changelog/"
+                                          "var/cache/apt/*.bin"))
+>>>>>>> tests/test_meta_release_core.py
         for bin_file in bin_list:
             try:
                 os.remove(bin_file)
@@ -186,7 +200,11 @@ class TestMetaReleaseCore(unittest.TestCase):
             supported for supported in di.supported() if di.is_lts(supported)
         ]
         with EnvironmentVarGuard() as environ:
+<<<<<<< tests/test_meta_release_core.py
             environ["META_RELEASE_FAKE_CODENAME"] = ltses[-2]
+=======
+            environ["META_RELEASE_FAKE_CODENAME"] = "bionic"
+>>>>>>> tests/test_meta_release_core.py
             meta = MetaReleaseCore(forceDownload=True)
             while meta.downloading:
                 time.sleep(0.1)
diff --git a/tests/test_update_list.py b/tests/test_update_list.py
index 93dfe66..ebd2b60 100644
--- a/tests/test_update_list.py
+++ b/tests/test_update_list.py
@@ -34,7 +34,12 @@ class PhasedTestCase(unittest.TestCase):
 
     def tearDown(self):
         try:
+<<<<<<< tests/test_update_list.py
             shutil.rmtree(os.path.join(self.aptroot, "var/cache/apt"))
+=======
+            shutil.rmtree(os.path.join(self.aptroot,
+                          "var/cache/apt"))
+>>>>>>> tests/test_update_list.py
         except OSError:
             pass
 
@@ -129,8 +134,12 @@ class GroupingTestCase(unittest.TestCase):
         real_arch = apt.apt_pkg.config.find("APT::Architecture")
         apt.apt_pkg.config.set("APT::Architecture", "amd64")
         self.addCleanup(
+<<<<<<< tests/test_update_list.py
             lambda: apt.apt_pkg.config.set("APT::Architecture", real_arch)
         )
+=======
+            lambda: apt.apt_pkg.config.set("APT::Architecture", real_arch))
+>>>>>>> tests/test_update_list.py
 
         def set_versioned_kernel_pkgs(real_versioned_kernel_pkgs):
             apt.apt_pkg.config.clear("APT::VersionedKernelPackages")
@@ -141,6 +150,7 @@ class GroupingTestCase(unittest.TestCase):
         real_versioned_kernel_pkgs = apt.apt_pkg.config.value_list()
         set_versioned_kernel_pkgs(["linux-.*"])
         self.addCleanup(
+<<<<<<< tests/test_update_list.py
             lambda: set_versioned_kernel_pkgs(real_versioned_kernel_pkgs)
         )
 
@@ -148,11 +158,20 @@ class GroupingTestCase(unittest.TestCase):
         self.cache = MyCache(
             apt.progress.base.OpProgress(), rootdir=self.aptroot
         )
+=======
+            lambda: set_versioned_kernel_pkgs(real_versioned_kernel_pkgs))
+
+        self.aptroot = os.path.join(CURDIR,
+                                    "aptroot-grouping-test")
+        self.cache = MyCache(apt.progress.base.OpProgress(),
+                             rootdir=self.aptroot)
+>>>>>>> tests/test_update_list.py
         self.cache.open()
         self.cache["linux-generic-to-remove"].mark_auto(True)
         self.cache["linux-headers-to-remove"].mark_auto(True)
         mock_installed.__get__ = self.fake_installed_files
         mock_desktop.side_effect = self.fake_desktop
+<<<<<<< tests/test_update_list.py
         self.updates_list = UpdateList.UpdateList(parent=None, dist="lucid")
         self.updates_list.update(
             self.cache,
@@ -162,6 +181,17 @@ class GroupingTestCase(unittest.TestCase):
     def tearDown(self):
         try:
             shutil.rmtree(os.path.join(self.aptroot, "var/cache/apt"))
+=======
+        self.updates_list = UpdateList.UpdateList(parent=None, dist='lucid')
+        self.updates_list.update(self.cache,
+                                 duplicate_packages=["linux-generic-dup1",
+                                                     "linux-generic-dup2"])
+
+    def tearDown(self):
+        try:
+            shutil.rmtree(os.path.join(self.aptroot,
+                          "var/cache/apt"))
+>>>>>>> tests/test_update_list.py
         except OSError:
             pass
 
@@ -219,22 +249,35 @@ class GroupingTestCase(unittest.TestCase):
         group = self.updates_list.update_groups[3]
         self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
         self.assertIsNotNone(group.core_item)
+<<<<<<< tests/test_update_list.py
         self.assertEqual(group.core_item.pkg.name, "linux-show-player")
         self.assertListEqual(
             [x.pkg.name for x in group.items], ["linux-show-player"]
         )
+=======
+        self.assertEqual(group.core_item.pkg.name, 'linux-show-player')
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['linux-show-player'])
+>>>>>>> tests/test_update_list.py
 
     def test_pkg_multiple_deps(self):
         self.assertGreater(len(self.updates_list.update_groups), 4)
         group = self.updates_list.update_groups[4]
         self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
         self.assertIsNotNone(group.core_item)
+<<<<<<< tests/test_update_list.py
         self.assertEqual(
             group.core_item.pkg.name, "installed-pkg-multiple-deps"
         )
         self.assertListEqual(
             [x.pkg.name for x in group.items], ["installed-pkg-multiple-deps"]
         )
+=======
+        self.assertEqual(group.core_item.pkg.name,
+                         'installed-pkg-multiple-deps')
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['installed-pkg-multiple-deps'])
+>>>>>>> tests/test_update_list.py
 
     def test_security(self):
         self.assertEqual(len(self.updates_list.security_groups), 1)
@@ -291,6 +334,49 @@ class GroupingTestCase(unittest.TestCase):
             [x.pkg.name for x in group.items], ["linux-generic-dup2"]
         )
 
+    def test_base_grouping(self):
+        self.assertEqual(len(self.updates_list.update_groups), 6)
+        group = self.updates_list.update_groups[5]
+        self.assertIsInstance(group, UpdateList.UpdateSystemGroup)
+        self.assertIsNone(group.core_item)
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['ubuntu-minimal',
+                              'linux-test-hwe'])
+
+    def test_autoremove_grouping(self):
+        # test that packages staged for removal aren't grouped if they are
+        # kernel autoremove packages (LP: #1912718)
+        self.assertGreater(len(self.updates_list.kernel_autoremove_groups), 0)
+        group = self.updates_list.kernel_autoremove_groups[0]
+        self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
+        self.assertIsNotNone(group.core_item)
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['linux-generic-to-remove'])
+
+        self.assertEqual(len(self.updates_list.kernel_autoremove_groups), 2)
+        group = self.updates_list.kernel_autoremove_groups[1]
+        self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
+        self.assertIsNotNone(group.core_item)
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['linux-headers-to-remove'])
+
+    def test_duplicate_grouping(self):
+        # test that packages staged for removal aren't grouped if they are
+        # duplicate packages (LP: #1912718)
+        self.assertGreater(len(self.updates_list.duplicate_groups), 0)
+        group = self.updates_list.duplicate_groups[0]
+        self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
+        self.assertIsNotNone(group.core_item)
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['linux-generic-dup1'])
+
+        self.assertEqual(len(self.updates_list.duplicate_groups), 2)
+        group = self.updates_list.duplicate_groups[1]
+        self.assertIsInstance(group, UpdateList.UpdatePackageGroup)
+        self.assertIsNotNone(group.core_item)
+        self.assertListEqual([x.pkg.name for x in group.items],
+                             ['linux-generic-dup2'])
+
 
 if __name__ == "__main__":
     unittest.main()