From 46585f15a89dd1b55b8cdb3cf7101ea83a86db3b Mon Sep 17 00:00:00 2001 From: Micah Lee Date: Fri, 10 Jan 2020 17:23:19 -0800 Subject: [PATCH] Start printing container output to stdout as well, and update container --- dangerzone/tasks.py | 3 +++ share/container | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/dangerzone/tasks.py b/dangerzone/tasks.py index 7a5f6ab..20adbb3 100644 --- a/dangerzone/tasks.py +++ b/dangerzone/tasks.py @@ -19,6 +19,8 @@ class TaskBase(QtCore.QThread): def exec_container(self, args, watch="stdout"): args = [self.common.container_runtime] + args args_str = " ".join(pipes.quote(s) for s in args) + + print() print(f"Executing: {args_str}") output = f"Executing: {args_str}\n\n" self.update_details.emit(output) @@ -38,6 +40,7 @@ class TaskBase(QtCore.QThread): for line in pipe: output += line + print(line, end="") self.update_details.emit(output) if watch == "stdout": diff --git a/share/container b/share/container index 8659910..59e5a66 160000 --- a/share/container +++ b/share/container @@ -1 +1 @@ -Subproject commit 86599101444c476d2c53a97232e8c6bcbecadc09 +Subproject commit 59e5a6618ce391b30b9123d545124d92a223b8dc