diff --git a/dangerzone/tasks.py b/dangerzone/tasks.py index 5df4f55..01a968f 100644 --- a/dangerzone/tasks.py +++ b/dangerzone/tasks.py @@ -61,7 +61,7 @@ class PullImageTask(TaskBase): def run(self): self.update_label.emit("Pulling container image") self.update_details.emit("") - args = ["pull", "ubuntu:20.04"] + args = ["pull", "debian:buster"] returncode, _ = self.exec_container(args, watch="stderr") if returncode != 0: @@ -122,7 +122,11 @@ class ConvertToPixels(TaskBase): # Did we hit an error? for line in output.split("\n"): - if "failed:" in line or "The document format is not supported" in line: + if ( + "failed:" in line + or "The document format is not supported" in line + or "Error" in line + ): self.task_failed.emit(output) return diff --git a/share/container b/share/container index 48fbf72..9de7f4c 160000 --- a/share/container +++ b/share/container @@ -1 +1 @@ -Subproject commit 48fbf72a24a3c7f5e3f36baf00d4fd137ae7ab22 +Subproject commit 9de7f4cd81e71df0dcea4c4f9a76bee6a27cb234