Administration/pmbootstrap-meow
2
0
Fork 0
forked from Mirror/pmbootstrap
Code Pull requests Activity Actions

FIXME: helpers: run: handle Arch in cmd (MR 2252)

Browse source 
We need a better solution here.

Signed-off-by: Caleb Connolly <caleb@postmarketos.org>
This commit is contained in:
Caleb Connolly 2024-06-09 08:01:27 +02:00 • committed by Oliver Smith
parent 53a2953a4a
commit aba3584b02
No known key found for this signature in database
GPG key ID: 5AE7F5513E0885CB
1 changed files with 9 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

11
pmb/helpers/run.py
View file

@ -3,6 +3,7 @@
import os import os
from pathlib import Path from pathlib import Path
import subprocess import subprocess
from pmb.core.arch import Arch
import pmb.helpers.run_core import pmb.helpers.run_core
from typing import Any, Dict, List, Optional, Sequence from typing import Any, Dict, List, Optional, Sequence
from pmb.types import Env, PathString, PmbArgs from pmb.types import Env, PathString, PmbArgs
@ -19,7 +20,13 @@ def user(cmd: Sequence[PathString], working_dir: Optional[Path] = None, output:
See pmb.helpers.run_core.core() for a detailed description of all other See pmb.helpers.run_core.core() for a detailed description of all other
arguments and the return value. arguments and the return value.
""" """
cmd_parts = [os.fspath(x) for x in cmd] cmd_parts = []
for c in cmd:
if isinstance(c, Arch):
c = str(c)
else:
c = os.fspath(c)
cmd_parts.append(c)
# Readable log message (without all the escaping) # Readable log message (without all the escaping)
msg = "% " msg = "% "
for key, value in env.items(): for key, value in env.items():
@ -42,7 +49,7 @@ def user_output(cmd: Sequence[PathString], working_dir: Optional[Path] = None, o
ret = user(cmd, working_dir, output, output_return=True, check=check, env=env, sudo=sudo) ret = user(cmd, working_dir, output, output_return=True, check=check, env=env, sudo=sudo)
if not isinstance(ret, str): if not isinstance(ret, str):
raise TypeError("Expected str output, got " + str(ret)) raise TypeError("Expected str output, got " + str(ret))
return ret return ret