From: Daan De Meyer Date: Tue, 30 Jan 2024 14:37:39 +0000 (+0100) Subject: Make options= argument for invoke_zypper() keyword-only X-Git-Tag: v21~77^2~15 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=24f59cf3cdda8feef2853167d3050f8e9437e277;p=thirdparty%2Fmkosi.git Make options= argument for invoke_zypper() keyword-only --- diff --git a/mkosi/distributions/opensuse.py b/mkosi/distributions/opensuse.py index 33abab5fd..a6304952e 100644 --- a/mkosi/distributions/opensuse.py +++ b/mkosi/distributions/opensuse.py @@ -67,14 +67,14 @@ class Installer(DistributionInstaller): "--download", "in-advance", "--recommends" if context.config.with_recommends else "--no-recommends", ] - invoke_zypper(context, "install", packages, options, apivfs=apivfs) + invoke_zypper(context, "install", packages, options=options, apivfs=apivfs) else: invoke_dnf(context, "install", packages, apivfs=apivfs) @classmethod def remove_packages(cls, context: Context, packages: Sequence[str]) -> None: if find_binary("zypper", root=context.config.tools()): - invoke_zypper(context, "remove", packages, ["--clean-deps"]) + invoke_zypper(context, "remove", packages, options=["--clean-deps"]) else: invoke_dnf(context, "remove", packages) diff --git a/mkosi/installer/zypper.py b/mkosi/installer/zypper.py index 2996d046c..8e4259060 100644 --- a/mkosi/installer/zypper.py +++ b/mkosi/installer/zypper.py @@ -78,7 +78,8 @@ def zypper_cmd(context: Context) -> list[PathString]: def invoke_zypper( context: Context, verb: str, - packages: Sequence[str], + packages: Sequence[str] = (), + *, options: Sequence[str] = (), apivfs: bool = True, ) -> None: