Merge ~nteodosio/update-manager:main into update-manager:main

[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)]

Great, thanks!

review: Approve

diff --git a/UpdateManager/Core/MyCache.py b/UpdateManager/Core/MyCache.py
index 66f33f9..e29333c 100644
--- a/UpdateManager/Core/MyCache.py
+++ b/UpdateManager/Core/MyCache.py
@@ -76,6 +76,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()
@@ -468,9 +469,18 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
                     )
         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"
@@ -478,7 +488,7 @@ class MyCache(DistUpgrade.DistUpgradeCache.MyCache):
         ) % (
             name,
             getattr(self[name].installed, "version", None),
-            self[name].candidate.version,
+            version,
         )
         if self.CHANGELOG_ORIGIN not in [o.origin for o in origins]:
             self._fetch_changelog_for_third_party_package(name, origins)
diff --git a/UpdateManager/UpdateManager.py b/UpdateManager/UpdateManager.py
index 16cc18e..2e6aed4 100644
--- a/UpdateManager/UpdateManager.py
+++ b/UpdateManager/UpdateManager.py
@@ -305,6 +305,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,
diff --git a/debian/changelog b/debian/changelog
index a0a7672..b8ee063 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+update-manager (1:24.04.1) noble; 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:45:02 +0100
+
 update-manager (1:23.10.2) mantic; urgency=medium
 
   * Ubuntu Pro (LP: #1990450):