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

[Nathan Teodosio]

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

Can't run autopkgtests right now: https://irclogs.ubuntu.com/2023/11/15/%23ubuntu-quality.txt. But lines are <80 characters.

Test case
---------

  ua detach --assume-yes && apt install hello
  # Make sure 'apt policy hello' gives non-esm version
  ./update-manager

Select hello package and verify that "Available version" is an esm one, and not the same as the "Installed version".

Also verify that non-pro packages' "Available version" show something sensible and didn't regress.

[Sebastien Bacher (seb128)]

Thanks!

review: Approve

diff --git a/UpdateManager/Core/MyCache.py b/UpdateManager/Core/MyCache.py
index e86c9b3..7639429 100644
--- a/UpdateManager/Core/MyCache.py
+++ b/UpdateManager/Core/MyCache.py
@@ -81,6 +81,7 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
         self._initDepCache()
         self.all_changes = {}
         self.all_news = {}
+        self.pro_versions = {}
         # on broken packages, try to fix via saveDistUpgrade()
         if self._depcache.broken_count > 0:
             self.saveDistUpgrade()
@@ -424,14 +425,22 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
                         "Please check your Internet connection.")
         self.all_changes[name] += error_message
 
+    # If the machine is not attached to Ubuntu Pro, Update Manager advertises
+    # the upgrades that would be available if it were attached.
+    # As that is unbeknownst to Apt, we need this map to show the correct
+    # version of each upgradable-if-pro-subscribed package.
+    def create_pro_cache(self, pro_pkgs):
+        for (name, version, _, _) in pro_pkgs:
+            self.pro_versions[name] = version
+
     def get_changelog(self, name):
         " get the changelog file from the changelog location "
         origins = self[name].candidate.origins
+        version = self.pro_versions.get(name, self[name].candidate.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),
-             self[name].candidate.version)
+            (name, getattr(self[name].installed, "version", None), version)
         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/UpdateManager.py b/UpdateManager/UpdateManager.py
index 16c3a4a..eef9fce 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -298,6 +298,7 @@ class UpdateManager(Gtk.Window):
                     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):
diff --git a/debian/changelog b/debian/changelog
index b8afa70..7354a85 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+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):