Commit 1dbfd29
committed
Fix encoding issue with stderr_value and kill_after_timeout
We don't properly encode our error message under python3.
Signed-off-by: Paul Belanger <pabelanger@redhat.com>1 parent 95ff827 commit 1dbfd29
1 file changed
Lines changed: 2 additions & 2 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -780,8 +780,8 @@ def _kill_process(pid): | |||
| 780 | 780 | if kill_after_timeout: | |
| 781 | 781 | watchdog.cancel() | |
| 782 | 782 | if kill_check.isSet(): | |
| 783 | - stderr_value = 'Timeout: the command "%s" did not complete in %d ' \ | ||
| 784 | - 'secs.' % (" ".join(command), kill_after_timeout) | ||
| 783 | + stderr_value = ('Timeout: the command "%s" did not complete in %d ' | ||
| 784 | + 'secs.' % (" ".join(command), kill_after_timeout)).encode(defenc) | ||
| 785 | 785 | # strip trailing "\n" | |
| 786 | 786 | if stdout_value.endswith(b"\n"): | |
| 787 | 787 | stdout_value = stdout_value[:-1] | |
0 commit comments