[neon/forks/ubuntu-release-upgrader/Neon/unstable_focal] DistUpgrade: Avoid a traceback in metapkg is not in the cache

Brian Murray null at kde.org
Wed Apr 28 11:06:46 BST 2021


Git commit bb9e02757548b13e5824257a5bc2ebeb2a86b513 by Brian Murray.
Committed on 13/04/2021 at 18:33.
Pushed by jriddell into branch 'Neon/unstable_focal'.

Avoid a traceback in metapkg is not in the cache

M  +4    -0    DistUpgrade/DistUpgradeQuirks.py

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

diff --git a/DistUpgrade/DistUpgradeQuirks.py b/DistUpgrade/DistUpgradeQuirks.py
index 62406a0b..48d20327 100644
--- a/DistUpgrade/DistUpgradeQuirks.py
+++ b/DistUpgrade/DistUpgradeQuirks.py
@@ -968,6 +968,8 @@ class DistUpgradeQuirks(object):
             for snap in d2s["seeded"]:
                 seed = d2s["seeded"][snap]
                 metapkg = seed.get("metapkg", None)
+                if metapkg not in cache:
+                    continue
                 if metapkg and \
                         self.controller.cache[metapkg].is_installed == False:
                     continue
@@ -980,6 +982,8 @@ class DistUpgradeQuirks(object):
                 unseed = d2s["unseeded"][snap]
                 deb = unseed.get("deb", None)
                 metapkg = unseed.get("metapkg", None)
+                if metapkg not in cache:
+                    continue
                 if metapkg and \
                         self.controller.cache[metapkg].is_installed == False:
                     continue



More information about the Neon-commits mailing list