From: Daan De Meyer Date: Thu, 22 Feb 2024 19:36:12 +0000 (+0100) Subject: Get rid of cast X-Git-Tag: v21~32 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d551e9c02842fba4d557f591d3fafaf558c81ee1;p=thirdparty%2Fmkosi.git Get rid of cast --- diff --git a/mkosi/installer/apt.py b/mkosi/installer/apt.py index 475d8d891..440d34834 100644 --- a/mkosi/installer/apt.py +++ b/mkosi/installer/apt.py @@ -3,7 +3,7 @@ import os import textwrap from collections.abc import Iterable, Sequence from pathlib import Path -from typing import NamedTuple, Optional, cast +from typing import NamedTuple, Optional from mkosi.config import Config from mkosi.context import Context @@ -51,23 +51,24 @@ class Apt(PackageManager): @classmethod def scripts(cls, context: Context) -> dict[str, list[PathString]]: return { - command: apivfs_cmd(context.root) + cls.cmd(context, command) for command in ( - "apt", - "apt-cache", - "apt-cdrom", - "apt-config", - "apt-extracttemplates", - "apt-get", - "apt-key", - "apt-mark", - "apt-sortpkgs", - ) - } | cast(dict[str, list[PathString]], { + **{ + command: apivfs_cmd(context.root) + cls.cmd(context, command) for command in ( + "apt", + "apt-cache", + "apt-cdrom", + "apt-config", + "apt-extracttemplates", + "apt-get", + "apt-key", + "apt-mark", + "apt-sortpkgs", + ) + }, "mkosi-install" : ["apt-get", "install"], "mkosi-upgrade" : ["apt-get", "upgrade"], "mkosi-remove" : ["apt-get", "purge"], "mkosi-reinstall": ["apt-get", "install", "--reinstall"], - }) + } @classmethod def setup(cls, context: Context, repos: Iterable[Repository]) -> None: