From 380ad0515d2911e2d08a6f60edfa92568a7d71f2 Mon Sep 17 00:00:00 2001 From: Brendan Jackman Date: Wed, 9 Aug 2017 16:00:46 +0100 Subject: [PATCH] ssh: Improve error when failing to push file CalledProcessError doesn't include the output of the failed command in the message it prints, so use a HostError isntead. --- devlib/utils/ssh.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/devlib/utils/ssh.py b/devlib/utils/ssh.py index 5470367..aaab2dd 100644 --- a/devlib/utils/ssh.py +++ b/devlib/utils/ssh.py @@ -292,7 +292,8 @@ class SshConnection(object): try: check_output(command, timeout=timeout, shell=True) except subprocess.CalledProcessError as e: - raise subprocess.CalledProcessError(e.returncode, command_redacted e.output) + raise HostError("Failed to copy file with '{}'. Output:\n{}".format( + command_redacted, e.output)) except TimeoutError as e: raise TimeoutError(command_redacted, e.output)