almet/dangerzone
1
0
Fork 0
mirror of https://github.com/freedomofpress/dangerzone.git synced 2025-04-28 18:02:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Update container

Browse source
This commit is contained in:
Micah Lee 2020-02-26 17:26:18 -08:00
parent 4c9bbfe217
commit 52cbbca7c6
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
2 changed files with 7 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
dangerzone/tasks.py
View file

@ -61,7 +61,7 @@ class PullImageTask(TaskBase):
def run(self): def run(self):
self.update_label.emit("Pulling container image") self.update_label.emit("Pulling container image")
self.update_details.emit("") self.update_details.emit("")
args = ["pull", "ubuntu:20.04"] args = ["pull", "debian:buster"]
returncode, _ = self.exec_container(args, watch="stderr") returncode, _ = self.exec_container(args, watch="stderr")
if returncode != 0: if returncode != 0:
@ -122,7 +122,11 @@ class ConvertToPixels(TaskBase):
# Did we hit an error? # Did we hit an error?
for line in output.split("\n"): 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) self.task_failed.emit(output)
return return

2
share/container

@ -1 +1 @@
Subproject commit 48fbf72a24a3c7f5e3f36baf00d4fd137ae7ab22 Subproject commit 9de7f4cd81e71df0dcea4c4f9a76bee6a27cb234