[neon/forks/ubuntu-release-upgrader/Neon/unstable_focal] /: reenable the quirk (it was disabled in impish)

Brian Murray null at kde.org
Wed Jul 28 09:25:04 BST 2021


Git commit 7f45eed4f804e9497907c50aab2b6dcaa8696cf8 by Brian Murray.
Committed on 01/07/2021 at 00:12.
Pushed by jriddell into branch 'Neon/unstable_focal'.

reenable the quirk (it was disabled in impish)

M  +1    -1    DistUpgrade/DistUpgradeQuirks.py
M  +1    -1    debian/changelog

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

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 70f1bbe8..70b204b5 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -163,7 +163,7 @@ class DistUpgradeQuirks(object):
     def PreDistUpgradeCache(self):
         """ run right before calculating the dist-upgrade """
         logging.debug("running Quirks.PreDistUpgradeCache")
-        # self._install_python_is_python2()
+        self._install_python_is_python2()
 
     # individual quirks handler that run *after* the dist-upgrade was
     # calculated in the cache
diff --git a/debian/changelog b/debian/changelog
index 9958aab2..602837fb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-ubuntu-release-upgrader (1:20.04.34) UNRELEASED; urgency=medium
+ubuntu-release-upgrader (1:20.04.34) focal; urgency=medium
 
   * DistUpgrade/DistUpgradeQuirks.py: If universe is not enabled and the
     upgrader is trying to transition from python to python2 produce an error



More information about the Neon-commits mailing list