Skip to content

Commit 5274255

Browse files
committed
Fixed print/debug messages when running commands on localhost
Fixed some earlier here: a77369a but missed a few. The underlying issue is that aramid result.stdout and stderr are strings but when we connect to localhost we use a subprocess and result.stdout/stderr are byte sequences and so can't be appended to each other as strings can. Ticket: CFE-4024 Changelog: title
1 parent 173cac0 commit 5274255

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

cf_remote/ssh.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -176,7 +176,8 @@ def ssh_cmd(connection, cmd, errors=False):
176176
else:
177177
msg = "Non-sudo command unexpectedly exited: '%s' [%d]" % (cmd, result.retcode)
178178
if errors:
179-
print(result.stdout + result.stderr)
179+
print(result.stdout if result.stdout is not None else "")
180+
print(result.stderr if result.stderr is not None else "")
180181
log.error(msg)
181182
else:
182183
log.debug(result.stdout if result.stdout is not None else "")
@@ -199,9 +200,11 @@ def ssh_sudo(connection, cmd, errors=False):
199200
else:
200201
msg = "Sudo command unexpectedly exited: '%s' [%d]" % (cmd, result.retcode)
201202
if errors:
202-
print(result.stdout + result.stderr)
203+
print(result.stdout if result.stdout is not None else "")
204+
print(result.stderr if result.stderr is not None else "")
203205
log.error(msg)
204206
else:
205-
log.debug(result.stdout + result.stderr)
207+
log.debug(result.stdout if result.stdout is not None else "")
208+
log.debug(result.stderr if result.stderr is not None else "")
206209
log.debug(msg)
207210
return None

0 commit comments

Comments
 (0)