[neon/forks/ubuntu-release-upgrader/Neon/unstable_focal] /: DistUpgrade/DistUpgradeQuirks.py: Restore code which ensured the python package was maked for removal. (LP: #1928397)

[Brian Murray]

Git commit 24212b5317bc81f17ef8612706881e9880f2d953 by Brian Murray.
Committed on 13/05/2021 at 23:07.
Pushed by jriddell into branch 'Neon/unstable_focal'.

DistUpgrade/DistUpgradeQuirks.py: Restore code which ensured the python package was maked for removal. (LP: #1928397)

M  +5    -0    DistUpgrade/DistUpgradeQuirks.py
M  +3    -1    debian/changelog

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

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 28122bb5..63c0465d 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -933,6 +933,11 @@ class DistUpgradeQuirks(object):
                     solver.protect(cache[new])
                 solver.clear(cache[old])
                 solver.remove(cache[old])
+        # protect our decision to remove legacy 'python' (as a
+        # dependency of python-minimal, removed above)
+        py = 'python'
+        if py in cache and cache[py].marked_delete:
+                solver.protect(cache[py])
 
         solver.resolve()
 
diff --git a/debian/changelog b/debian/changelog
index 213de129..cafb8ccb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,8 +4,10 @@ ubuntu-release-upgrader (1:20.04.33) UNRELEASED; urgency=medium
     if a KeyboardInterrupt event is received and redirect the output of
     gnome-session-inhibit to devnull so a message regarding Ctrl-C is not
     displayed. (LP: #1898026)
+  * DistUpgrade/DistUpgradeQuirks.py: Restore code which ensured the python
+    package was maked for removal. (LP: #1928397)
 
- -- Brian Murray <brian at ubuntu.com>  Mon, 26 Apr 2021 15:23:55 -0700
+ -- Brian Murray <brian at ubuntu.com>  Thu, 13 May 2021 16:04:49 -0700
 
 ubuntu-release-upgrader (1:20.04.32) focal; urgency=medium