From 8fd137740723fe9ebbf1d6dcba3490d544970645 Mon Sep 17 00:00:00 2001 From: Silke Hofstra Date: Wed, 11 Sep 2024 12:52:30 +0200 Subject: [PATCH] pisi: Use the same reordering logic in Python2 as in Python3 Swap the `reorder_base_packages` functions to make the logic the same in Python2 and Python3. --- pisi/operations/helper.py | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/pisi/operations/helper.py b/pisi/operations/helper.py index c5e5c4b..37eea80 100644 --- a/pisi/operations/helper.py +++ b/pisi/operations/helper.py @@ -22,8 +22,7 @@ import pisi.conflict import pisi.db -def reorder_base_packages(order): - +def reorder_base_packages_old(order): componentdb = pisi.db.componentdb.ComponentDB() """system.base packages must be first in order""" @@ -44,7 +43,7 @@ def reorder_base_packages(order): ctx.ui.info(_("install_order: %s" % install_order)) return install_order -def reorder_base_packages_dummy(order): +def reorder_base_packages(order): """Dummy function that doesn't actually re-order system.base in front. We now use OrderedSets, which keep the original topological sort,