From: Jörg Behrmann <behrmann@physik.fu-berlin.de>
Date: Sat, 21 Sep 2024 05:08:22 +0000 (+0200)
Subject: Force multiline formatting in more places
X-Git-Tag: v25~276^2~1
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d4a1d2f9feca00eb66a5f6a77d824bcde523037d;p=thirdparty%2Fmkosi.git

Force multiline formatting in more places
---

diff --git a/mkosi/__init__.py b/mkosi/__init__.py
index 0edc8bf97..3bfae473f 100644
--- a/mkosi/__init__.py
+++ b/mkosi/__init__.py
@@ -397,11 +397,19 @@ def configure_autologin(context: Context) -> None:
 
     with complete_step("Setting up autologin…"):
         configure_autologin_service(
-            context, "console-getty.service", "--noclear --keep-baud console 115200,38400,9600"
+            context,
+            "console-getty.service",
+            "--noclear --keep-baud console 115200,38400,9600",
+        )
+        configure_autologin_service(
+            context,
+            "getty@tty1.service",
+            "--noclear -",
         )
-        configure_autologin_service(context, "getty@tty1.service", "--noclear -")
         configure_autologin_service(
-            context, "serial-getty@hvc0.service", "--keep-baud 115200,57600,38400,9600 -"
+            context,
+            "serial-getty@hvc0.service",
+            "--keep-baud 115200,57600,38400,9600 -",
         )
 
 
@@ -2263,8 +2271,10 @@ def check_tools(config: Config, verb: Verb) -> None:
                 config,
                 version="254",
                 reason="build bootable images",
-                hint="Use ToolsTree=default to download most required tools including ukify automatically "
-                "or use Bootable=no to create a non-bootable image which doesn't require ukify",
+                hint=(
+                    "Use ToolsTree=default to download most required tools including ukify automatically "
+                    "or use Bootable=no to create a non-bootable image which doesn't require ukify"
+                ),
             )
 
         if config.output_format in (OutputFormat.disk, OutputFormat.esp):
@@ -3682,7 +3692,10 @@ def generate_key_cert_pair(args: Args) -> None:
 
     for f in ("mkosi.key", "mkosi.crt"):
         if Path(f).exists() and not args.force:
-            die(f"{f} already exists", hint=("To generate new keys, first remove mkosi.key and mkosi.crt"))
+            die(
+                f"{f} already exists",
+                hint="To generate new keys, first remove mkosi.key and mkosi.crt",
+            )
 
     log_step(f"Generating keys rsa:{keylength} for CN {cn!r}.")
     logging.info(
@@ -4137,7 +4150,8 @@ def run_verb(args: Args, images: Sequence[Config], *, resources: Path) -> None:
 
     if all(config == Config.default() for config in images):
         die(
-            "No configuration found", hint="Make sure mkosi is run from a directory with configuration files"
+            "No configuration found",
+            hint="Make sure mkosi is run from a directory with configuration files",
         )
 
     if args.verb == Verb.summary:
diff --git a/mkosi/config.py b/mkosi/config.py
index ebf088c8f..236dc1907 100644
--- a/mkosi/config.py
+++ b/mkosi/config.py
@@ -844,7 +844,11 @@ def config_make_enum_matcher(type: type[StrEnum]) -> ConfigMatchCallback:
 
 
 def config_make_list_parser(
-    delimiter: str, *, parse: Callable[[str], Any] = str, unescape: bool = False, reset: bool = True
+    delimiter: str,
+    *,
+    parse: Callable[[str], Any] = str,
+    unescape: bool = False,
+    reset: bool = True,
 ) -> ConfigParseCallback:
     def config_parse_list(value: Optional[str], old: Optional[list[Any]]) -> Optional[list[Any]]:
         new = old.copy() if old else []
@@ -1023,7 +1027,10 @@ def config_make_filename_parser(hint: str) -> ConfigParseCallback:
             return None
 
         if not is_valid_filename(value):
-            die(f"{value!r} is not a valid filename.", hint=hint)
+            die(
+                f"{value!r} is not a valid filename.",
+                hint=hint,
+            )
 
         return value
 
diff --git a/mkosi/distributions/centos.py b/mkosi/distributions/centos.py
index 5beafe33b..75ef35c71 100644
--- a/mkosi/distributions/centos.py
+++ b/mkosi/distributions/centos.py
@@ -237,25 +237,48 @@ class Installer(DistributionInstaller):
         else:
             url = "metalink=https://mirrors.fedoraproject.org/metalink?arch=$basearch"
             for repo in ("epel", "epel-next"):
-                yield RpmRepository(repo, f"{url}&repo={repo}-$releasever", gpgurls, enabled=False)
                 yield RpmRepository(
-                    f"{repo}-debuginfo", f"{url}&repo={repo}-debug-$releasever", gpgurls, enabled=False
+                    repo,
+                    f"{url}&repo={repo}-$releasever",
+                    gpgurls,
+                    enabled=False,
                 )
                 yield RpmRepository(
-                    f"{repo}-source", f"{url}&repo={repo}-source-$releasever", gpgurls, enabled=False
+                    f"{repo}-debuginfo",
+                    f"{url}&repo={repo}-debug-$releasever",
+                    gpgurls,
+                    enabled=False,
+                )
+                yield RpmRepository(
+                    f"{repo}-source",
+                    f"{url}&repo={repo}-source-$releasever",
+                    gpgurls,
+                    enabled=False,
                 )
 
             yield RpmRepository(
-                "epel-testing", f"{url}&repo=testing-epel$releasever", gpgurls, enabled=False
+                "epel-testing",
+                f"{url}&repo=testing-epel$releasever",
+                gpgurls,
+                enabled=False,
             )
             yield RpmRepository(
-                "epel-testing-debuginfo", f"{url}&repo=testing-debug-epel$releasever", gpgurls, enabled=False
+                "epel-testing-debuginfo",
+                f"{url}&repo=testing-debug-epel$releasever",
+                gpgurls,
+                enabled=False,
             )
             yield RpmRepository(
-                "epel-testing-source", f"{url}&repo=testing-source-epel$releasever", gpgurls, enabled=False
+                "epel-testing-source",
+                f"{url}&repo=testing-source-epel$releasever",
+                gpgurls,
+                enabled=False,
             )
             yield RpmRepository(
-                "epel-next-testing", f"{url}&repo=epel-testing-next-$releasever", gpgurls, enabled=False
+                "epel-next-testing",
+                f"{url}&repo=epel-testing-next-$releasever",
+                gpgurls,
+                enabled=False,
             )
             yield RpmRepository(
                 "epel-next-testing-debuginfo",