From: Daan De Meyer <daan.j.demeyer@gmail.com>
Date: Sun, 16 Apr 2023 09:41:41 +0000 (+0200)
Subject: Simplify apt invocation
X-Git-Tag: v15~246^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4ee4695acc68d4bcc0ce422abf6ccf53a7b01345;p=thirdparty%2Fmkosi.git

Simplify apt invocation
---

diff --git a/mkosi/distributions/debian.py b/mkosi/distributions/debian.py
index f03a6c104..021b61218 100644
--- a/mkosi/distributions/debian.py
+++ b/mkosi/distributions/debian.py
@@ -98,8 +98,8 @@ class DebianInstaller(DistributionInstaller):
         policyrcd.chmod(0o755)
 
         setup_apt(state, cls.repositories(state))
-        invoke_apt(state, "get", "update")
-        invoke_apt(state, "get", "install", packages)
+        invoke_apt(state, "update")
+        invoke_apt(state, "install", packages)
 
         policyrcd.unlink()
 
@@ -111,7 +111,7 @@ class DebianInstaller(DistributionInstaller):
 
     @classmethod
     def remove_packages(cls, state: MkosiState, packages: Sequence[str]) -> None:
-        invoke_apt(state, "get", "purge", packages)
+        invoke_apt(state, "purge", packages)
 
 
 # Debian calls their architectures differently, so when calling debootstrap we
@@ -184,15 +184,9 @@ def setup_apt(state: MkosiState, repos: Sequence[str]) -> None:
 
 def invoke_apt(
     state: MkosiState,
-    subcommand: str,
     operation: str,
     extra: Sequence[str] = tuple(),
 ) -> CompletedProcess:
-    cmdline = [
-        f"/usr/bin/apt-{subcommand}",
-        operation,
-        *extra,
-    ]
     env: dict[str, PathString] = dict(
         APT_CONFIG=state.workspace / "apt/apt.conf",
         DEBIAN_FRONTEND="noninteractive",
@@ -201,4 +195,4 @@ def invoke_apt(
         INITRD="No",
     )
 
-    return run_with_apivfs(state, cmdline, env=env)
+    return run_with_apivfs(state, ["apt-get", operation, *extra], env=env)