From f85fdf678d760f44b6a3ca5482f809c578b7da85 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Tue, 26 Sep 2023 14:10:52 +0200 Subject: [PATCH] clan config: print command in more instances --- pkgs/clan-cli/clan_cli/config/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/config/__init__.py b/pkgs/clan-cli/clan_cli/config/__init__.py index ed0557a4f..e71584788 100644 --- a/pkgs/clan-cli/clan_cli/config/__init__.py +++ b/pkgs/clan-cli/clan_cli/config/__init__.py @@ -107,12 +107,12 @@ def options_for_machine(machine_name: str, show_trace: bool = False) -> dict: cmd = nix_eval(flags=flags) proc = subprocess.run( cmd, - capture_output=True, + stdout=subprocess.PIPE, text=True, ) if proc.returncode != 0: - raise Exception( - f"Failed to read options for machine {machine_name}:\n{shlex.join(cmd)} returned:\n{proc.stderr}" + raise ClanError( + f"Failed to read options for machine {machine_name}:\n{shlex.join(cmd)}\nexit with {proc.returncode}" ) return json.loads(proc.stdout)