Skip to content

Commit d44aae1

Browse files
daandemeyerbehrmann
authored andcommitted
Revert "Do not try to install packages that are listed in RemovePackages="
This reverts commit b3d6e69. Fixes systemd#3911
1 parent 1873ad0 commit d44aae1

File tree

2 files changed

+5
-13
lines changed

2 files changed

+5
-13
lines changed

mkosi/__init__.py

Lines changed: 5 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -254,25 +254,18 @@ def remove_files(context: Context) -> None:
254254
t.rmdir()
255255

256256

257-
def finalize_packages(config: Config) -> list[str]:
258-
s = set(config.remove_packages)
259-
return [p for p in config.packages if p not in s]
260-
261-
262257
def install_distribution(context: Context) -> None:
263-
packages = finalize_packages(context.config)
264-
265258
if context.config.base_trees:
266-
if not packages:
259+
if not context.config.packages:
267260
return
268261

269262
with complete_step(
270263
f"Installing extra packages for {context.config.distribution.installer.pretty_name()}"
271264
):
272-
context.config.distribution.installer.install_packages(context, packages)
265+
context.config.distribution.installer.install_packages(context, context.config.packages)
273266
else:
274267
if context.config.overlay or context.config.output_format.is_extension_image():
275-
if packages:
268+
if context.config.packages:
276269
die(
277270
"Cannot install packages in extension images without a base tree",
278271
hint="Configure a base tree with the BaseTrees= setting",
@@ -307,8 +300,8 @@ def install_distribution(context: Context) -> None:
307300
with umask(~0o600):
308301
(context.root / "boot/loader/entries.srel").write_text("type1\n")
309302

310-
if packages:
311-
context.config.distribution.installer.install_packages(context, packages)
303+
if context.config.packages:
304+
context.config.distribution.installer.install_packages(context, context.config.packages)
312305

313306
for f in (
314307
"var/lib/systemd/random-seed",

mkosi/config.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2384,7 +2384,6 @@ def cache_manifest(self) -> dict[str, Any]:
23842384
),
23852385
"packages": sorted(self.packages),
23862386
"build_packages": sorted(self.build_packages),
2387-
"remove_packages": sorted(self.remove_packages),
23882387
"package_directories": [
23892388
(p.name, p.stat().st_mtime_ns)
23902389
for d in self.package_directories

0 commit comments

Comments
 (0)