Compare commits

..

No commits in common. "d4d60982415d69ab5e4759c6cd62e5db27866d02" and "51b4f0f5f29ef0af7e523eae026f19793fac8941" have entirely different histories.

2 changed files with 8 additions and 9 deletions

View file

@ -25,8 +25,8 @@ def make_image(
pubkey_path: str | None = None, pubkey_path: str | None = None,
) -> None: ) -> None:
"""Make a binary bootable image.""" """Make a binary bootable image."""
args: list[str | tuple[str, ...]] = [ args = [
"grub-mkimage", ("grub-mkimage",),
("--compress", COMPRESSION), ("--compress", COMPRESSION),
("--format", image_format), ("--format", image_format),
("--output", image_path), ("--output", image_path),
@ -35,6 +35,6 @@ def make_image(
if pubkey_path: if pubkey_path:
args.append(("--pubkey", pubkey_path)) args.append(("--pubkey", pubkey_path))
args.extend(modules) args.extend(modules)
if extra_modules := MODULES.get(image_format): if modules := MODULES.get(image_format):
args.extend(extra_modules) args.extend(modules)
ps.run(*args) ps.run(*args)

View file

@ -9,11 +9,10 @@ def get_tuples_args(*items: str | tuple[str, ...]) -> list[str]:
"""Turn arguments tuples into an arguments list.""" """Turn arguments tuples into an arguments list."""
args: list[str] = [] args: list[str] = []
for item in items: for item in items:
match item: if type(item) is tuple:
case str():
args.append(item)
case tuple():
args.extend(item) args.extend(item)
else:
args.append(item)
return args return args