From: Daan De Meyer Date: Tue, 5 Mar 2024 11:00:26 +0000 (+0100) Subject: Inline always variable X-Git-Tag: v21~9^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F2460%2Fhead;p=thirdparty%2Fmkosi.git Inline always variable --- diff --git a/mkosi/installer/__init__.py b/mkosi/installer/__init__.py index 9644e8a09..d50c026fc 100644 --- a/mkosi/installer/__init__.py +++ b/mkosi/installer/__init__.py @@ -106,12 +106,11 @@ def clean_package_manager_metadata(context: Context) -> None: # (which are often used as a base tree for extension images and thus should retain package manager metadata) or if # the corresponding package manager is installed in the image. - always = context.config.clean_package_metadata == ConfigFeature.enabled executable = context.config.distribution.package_manager(context.config).executable(context.config) for tool, paths in (("rpm", ["var/lib/rpm", "usr/lib/sysimage/rpm"]), ("dnf5", ["usr/lib/sysimage/libdnf5"]), ("dpkg", ["var/lib/dpkg"]), (executable, [f"var/lib/{subdir}", f"var/cache/{subdir}"])): - if always or not find_binary(tool, root=context.root): + if context.config.clean_package_metadata == ConfigFeature.enabled or not find_binary(tool, root=context.root): rmtree(*(context.root / p for p in paths if (context.root / p).exists()), sandbox=context.sandbox)