CuteEngineering/cutekit
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Display command name next to exec/popen exception

Browse source
This commit is contained in:
Sleepy Monax 2023-02-18 20:58:58 +01:00
parent e0b893708d
commit e3d7793088
1 changed files with 9 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
osdk/shell.py
View file

@ -123,16 +123,17 @@ def exec(*args: str):
proc = subprocess.run(args) proc = subprocess.run(args)
except FileNotFoundError: except FileNotFoundError:
raise Exception(f"Command not found") raise Exception(f"{args[0]}: Command not found")
except KeyboardInterrupt: except KeyboardInterrupt:
raise Exception("Interrupted") raise Exception(f"{args[0]}: Interrupted")
if proc.returncode == -signal.SIGSEGV: if proc.returncode == -signal.SIGSEGV:
raise Exception("Segmentation fault") raise Exception(f"{args[0]}: Segmentation fault")
if proc.returncode != 0: if proc.returncode != 0:
raise Exception(f"Process exited with code {proc.returncode}") raise Exception(
f"{args[0]}: Process exited with code {proc.returncode}")
return True return True
@ -143,13 +144,14 @@ def popen(*args: str) -> str:
try: try:
proc = subprocess.run(args, stdout=subprocess.PIPE, stderr=sys.stderr) proc = subprocess.run(args, stdout=subprocess.PIPE, stderr=sys.stderr)
except FileNotFoundError: except FileNotFoundError:
raise Exception(f"Command not found") raise Exception(f"{args[0]}: Command not found")
if proc.returncode == -signal.SIGSEGV: if proc.returncode == -signal.SIGSEGV:
raise Exception("Segmentation fault") raise Exception(f"{args[0]}: Segmentation fault")
if proc.returncode != 0: if proc.returncode != 0:
raise Exception(f"Process exited with code {proc.returncode}") raise Exception(
f"{args[0]}: Process exited with code {proc.returncode}")
return proc.stdout.decode('utf-8') return proc.stdout.decode('utf-8')