From d3abedafa9990541ec3e9f6bc4c27c1e473e399e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Thalheim?= Date: Fri, 8 Nov 2024 15:17:04 +0100 Subject: [PATCH] don't show stacktrace if update fail --- pkgs/clan-cli/clan_cli/ssh/__init__.py | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/pkgs/clan-cli/clan_cli/ssh/__init__.py b/pkgs/clan-cli/clan_cli/ssh/__init__.py index 498c5be41..522f2aa78 100644 --- a/pkgs/clan-cli/clan_cli/ssh/__init__.py +++ b/pkgs/clan-cli/clan_cli/ssh/__init__.py @@ -395,9 +395,8 @@ class Host: ret = p.wait(timeout=max(0, timeout - (time.time() - start))) if ret != 0: if check: - raise subprocess.CalledProcessError( - ret, cmd=cmd, output=stdout_data, stderr=stderr_data - ) + msg = f"Command {shlex.join(cmd)} failed with return code {ret}" + raise ClanError(msg) cmdlog.warning( f"[Command failed: {ret}] {displayed_cmd}", extra={"command_prefix": self.command_prefix}, @@ -602,7 +601,6 @@ def _worker( try: results[idx] = HostResult(host, func(host)) except Exception as e: - kitlog.exception(e) results[idx] = HostResult(host, e) @@ -644,7 +642,6 @@ class HostGroup: ) results.append(HostResult(host, proc)) except Exception as e: - kitlog.exception(e) results.append(HostResult(host, e)) def _run_remote( @@ -677,7 +674,6 @@ class HostGroup: ) results.append(HostResult(host, proc)) except Exception as e: - kitlog.exception(e) results.append(HostResult(host, e)) def _reraise_errors(self, results: list[HostResult[Any]]) -> None: