From: Zbigniew Jędrzejewski-Szmek Date: Thu, 20 Apr 2023 11:56:08 +0000 (+0200) Subject: Use the appropriate quote type X-Git-Tag: v15~226^2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F1467%2Fhead;p=thirdparty%2Fmkosi.git Use the appropriate quote type --- diff --git a/mkosi/run.py b/mkosi/run.py index 743318f0c..0a527ad34 100644 --- a/mkosi/run.py +++ b/mkosi/run.py @@ -238,7 +238,7 @@ def run( die(f"{cmdline[0]} not found in PATH.", e) except subprocess.CalledProcessError as e: if log: - die(f"\"{shlex.join(str(s) for s in cmdline)}\" returned non-zero exit code {e.returncode}.", e) + die(f'"{shlex.join(str(s) for s in cmdline)}" returned non-zero exit code {e.returncode}.', e) raise e @@ -262,7 +262,7 @@ def spawn( except FileNotFoundError: die(f"{cmdline[0]} not found in PATH.") except subprocess.CalledProcessError as e: - die(f"\"{shlex.join(str(s) for s in cmdline)}\" returned non-zero exit code {e.returncode}.", e) + die(f'"{shlex.join(str(s) for s in cmdline)}" returned non-zero exit code {e.returncode}.', e) def run_with_apivfs( @@ -312,7 +312,7 @@ def run_with_apivfs( except subprocess.CalledProcessError as e: if "run" in ARG_DEBUG: run([*cmdline, template.format("sh")], check=False, env=env, log=False) - die(f"\"{shlex.join(str(s) for s in cmd)}\" returned non-zero exit code {e.returncode}.") + die(f'"{shlex.join(str(s) for s in cmd)}" returned non-zero exit code {e.returncode}.') def run_workspace_command( @@ -370,7 +370,7 @@ def run_workspace_command( except subprocess.CalledProcessError as e: if "run" in ARG_DEBUG: run([*cmdline, template.format("sh")], check=False, env=env, log=False) - die(f"\"{shlex.join(str(s) for s in cmd)}\" returned non-zero exit code {e.returncode}.") + die(f'"{shlex.join(str(s) for s in cmd)}" returned non-zero exit code {e.returncode}.') finally: if state.workspace.joinpath("resolv.conf").is_symlink(): resolve.unlink(missing_ok=True)