From 3b77eb3625403b2325c70b5677248f811bc77acd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 26 Aug 2024 21:17:41 +0200 Subject: [PATCH] stages: workaround the two remaining autopep8 issues via `noqa` Small followup for https://github.com/osbuild/osbuild/pull/1864 There were two issues from `autopep8` left, both can be just silenced via the `# noqa` directive. --- stages/org.osbuild.debug-shell | 2 +- stages/org.osbuild.skopeo | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/stages/org.osbuild.debug-shell b/stages/org.osbuild.debug-shell index f1cdc8dd..ad48289c 100755 --- a/stages/org.osbuild.debug-shell +++ b/stages/org.osbuild.debug-shell @@ -32,7 +32,7 @@ KillSignal=SIGHUP # Unset locale for the console getty since the console has problems # displaying some internationalized messages. UnsetEnvironment=LANG LANGUAGE LC_CTYPE LC_NUMERIC LC_TIME LC_COLLATE LC_MONETARY LC_MESSAGES LC_PAPER LC_NAME LC_ADDRESS LC_TELEPHONE LC_MEASUREMENT LC_IDENTIFICATION -""" +""" # noqa with open(f"{tree}/etc/systemd/system/osbuild-debug-shell.service", "w", encoding="utf8") as f: f.write(unit) diff --git a/stages/org.osbuild.skopeo b/stages/org.osbuild.skopeo index 45bb98db..fd636e37 100755 --- a/stages/org.osbuild.skopeo +++ b/stages/org.osbuild.skopeo @@ -20,7 +20,7 @@ def main(inputs, output, options): if dest_type == "containers-storage": storage_root = destination.get("storage-path", "/var/lib/containers/storage") storage_driver = destination.get("storage-driver", "overlay") - dest = f"containers-storage:[{storage_driver}@{output}{storage_root}+/run/containers/storage]{image_name}" + dest = f"containers-storage:[{storage_driver}@{output}{storage_root}+/run/containers/storage]{image_name}" # noqa elif dest_type in ("oci", "oci-archive", "dir"): path = destination["path"] dest = f"{dest_type}:{output}{path}"