Merge lp:~sil2100/ubuntu-release-upgrader/package-section-fix into lp:ubuntu-release-upgrader

[Łukasz Zemczak]

New python3-apt bindings no longer provide Package.section, so switch to using Package.candidate.section whenever applicable. This fixes broken partial upgrades.

New python3-apt bindings no longer provide Package.section, so switch to using Package.candidate.section whenever applicable. This fixes broken partial upgrades.

I have tested this on eoan by installing a package with lots of dependencies, removing it (leaving many unneeded packages) and additionally downgrading of some other package. Then I ran dist-upgrade.py --partial etc., first on the package as-is (reproducing the failure) and then with the changes applied. Seems to work as expected.

I guess Julian originally mentioned going through the list of versions (via Package.versions) to get the section match, but I think that's not needed here and Package.candidate is more than enough.

[Julian Andres Klode (juliank)]

review: Needs Information

[lp:~sil2100/ubuntu-release-upgrader/package-section-fix]

3295. By Łukasz Zemczak on 2019-10-09

As per Julian's recommendation, check .installed instead.

[Łukasz Zemczak (sil2100)]

Thanks Julian! That indeed seems like a much safer bet.

[Brian Murray (brian-murray)]

Thanks for fixing this!

review: Approve

[Julian Andres Klode (juliank)]

review: Approve

=== modified file 'DistUpgrade/DistUpgradeCache.py'
--- DistUpgrade/DistUpgradeCache.py	2019-09-10 15:47:31 +0000
+++ DistUpgrade/DistUpgradeCache.py	2019-10-09 15:42:09 +0000
@@ -474,7 +474,8 @@
             for section in self.config.getlist("Distro", "KeepInstalledSection"):
                 for pkg in self:
                     if (pkg.candidate and pkg.candidate.downloadable
-                        and pkg.marked_delete and pkg.section == section):
+                        and pkg.marked_delete
+                        and pkg.candidate.section == section):
                         self._keep_installed(pkg.name, "Distro KeepInstalledSection rule: %s" % section)
             for key in self.metapkgs:
                 if key in self and (self[key].is_installed or
@@ -483,7 +484,7 @@
                         for pkg in self:
                             if (pkg.candidate and pkg.candidate.downloadable
                                 and pkg.marked_delete and
-                                pkg.section == section):
+                                pkg.candidate.section == section):
                                 self._keep_installed(pkg.name, "%s KeepInstalledSection rule: %s" % (key, section))
 
 
@@ -938,7 +939,7 @@
             return False
         # ensure we honor KeepInstalledSection here as well
         for section in self.config.getlist("Distro", "KeepInstalledSection"):
-            if pkgname in self and self[pkgname].section == section:
+            if pkgname in self and self[pkgname].installed.section == section:
                 logging.debug("skipping '%s' (in KeepInstalledSection)" % pkgname)
                 return False
         # if we don't have the package anyway, we are fine (this can