From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Thu, 3 Aug 2023 11:28:12 +0000 (+0200)
Subject: Sort packages for every distribution
X-Git-Tag: v15~44^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=2d957afd4cb786fd86c3a5af8cffaaf88a9a9373;p=thirdparty%2Fmkosi.git

Sort packages for every distribution
---

diff --git a/mkosi/distributions/gentoo.py b/mkosi/distributions/gentoo.py
index 5f4e97e6e..b001bd841 100644
--- a/mkosi/distributions/gentoo.py
+++ b/mkosi/distributions/gentoo.py
@@ -14,6 +14,7 @@ from mkosi.run import bwrap, chroot_cmd, run
 from mkosi.state import MkosiState
 from mkosi.tree import copy_tree, rmtree
 from mkosi.types import PathString
+from mkosi.util import sort_packages
 
 
 def invoke_emerge(state: MkosiState, packages: Sequence[str] = (), apivfs: bool = True) -> None:
@@ -32,7 +33,7 @@ def invoke_emerge(state: MkosiState, packages: Sequence[str] = (), apivfs: bool
             "--noreplace",
             *(["--verbose", "--quiet=n", "--quiet-fail=n"] if ARG_DEBUG.get() else ["--quiet-build", "--quiet"]),
             f"--root={state.root}",
-            *packages,
+            *sort_packages(packages),
         ],
         apivfs=state.root if apivfs else None,
         options=[
diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py
index 8a1c8bf3d..fb6bb2c3b 100644
--- a/mkosi/installer/apt.py
+++ b/mkosi/installer/apt.py
@@ -6,6 +6,7 @@ from collections.abc import Sequence
 from mkosi.run import bwrap
 from mkosi.state import MkosiState
 from mkosi.types import PathString
+from mkosi.util import sort_packages
 
 
 def setup_apt(state: MkosiState, repos: Sequence[str]) -> None:
@@ -103,6 +104,6 @@ def invoke_apt(
     packages: Sequence[str] = (),
     apivfs: bool = True,
 ) -> None:
-    bwrap(apt_cmd(state, command) + [operation, *packages],
+    bwrap(apt_cmd(state, command) + [operation, *sort_packages(packages)],
           apivfs=state.root if apivfs else None,
           env=state.config.environment)
diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py
index 930e7d39b..c7c9ab584 100644
--- a/mkosi/installer/zypper.py
+++ b/mkosi/installer/zypper.py
@@ -6,6 +6,7 @@ from mkosi.installer.dnf import Repo, fixup_rpmdb_location
 from mkosi.run import bwrap
 from mkosi.state import MkosiState
 from mkosi.types import PathString
+from mkosi.util import sort_packages
 
 
 def setup_zypper(state: MkosiState, repos: Sequence[Repo]) -> None:
@@ -67,7 +68,7 @@ def invoke_zypper(
     options: Sequence[str] = (),
     apivfs: bool = True,
 ) -> None:
-    bwrap(zypper_cmd(state) + [verb, *packages, *options],
+    bwrap(zypper_cmd(state) + [verb, *sort_packages(packages), *options],
           apivfs=state.root if apivfs else None,
           env=state.config.environment)