[neon/forks/ubuntu-release-upgrader/Neon/unstable_focal] DistUpgrade: Merge remote-tracking branch 'lp/ubuntu/focal' into Neon/unstable_focal

[Jonathan Riddell]

Git commit e9203bb6d34434a9d5cf676386d8bcc978f6e952 by Jonathan Riddell.
Committed on 28/04/2021 at 10:06.
Pushed by jriddell into branch 'Neon/unstable_focal'.

Merge remote-tracking branch 'lp/ubuntu/focal' into Neon/unstable_focal

M  +32   -8    DistUpgrade/DistUpgradeQuirks.py

https://invent.kde.org/neon/forks/ubuntu-release-upgrader/commit/e9203bb6d34434a9d5cf676386d8bcc978f6e952

diff --cc DistUpgrade/DistUpgradeQuirks.py
index 75f255cb,28122bb5..5701454a
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@@ -148,17 -135,12 +146,15 @@@ class DistUpgradeQuirks(object)
      def focalPostUpgrade(self):
          logging.debug("running Quirks.focalPostUpgrade")
          cache = self.controller.cache
-         if 'ubuntu-desktop' not in cache or \
-                 'snapd' not in cache:
+         if 'snapd' not in cache:
              logging.debug("package required for Quirk not in cache")
              return
-         if cache['ubuntu-desktop'].is_installed and \
-                 cache['snapd'].is_installed and \
+         if cache['snapd'].is_installed and \
                  self._snap_list:
              self._replaceDebsAndSnaps()
 +        # neon packages with versions < in focal tidy
 +        if os.path.exists('/etc/apt/preferences.d/98-focal-overrides'):
 +            os.remove('/etc/apt/preferences.d/98-focal-overrides')
  
      # individual quirks handler when the dpkg run is finished ---------
      def PostCleanup(self):