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

Fix bugs with testing if docker is ready

Browse source
This commit is contained in:
Micah Lee 2021-06-10 14:46:31 -07:00
parent a711ec1ded
commit 05f00ca53f
No known key found for this signature in database
GPG key ID: 403C2657CD994F73
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
dangerzone/gui/common.py
View file

@ -202,7 +202,7 @@ class GuiCommon(object):
return True return True
def ensure_docker_service_is_started(self): def ensure_docker_service_is_started(self):
if not is_docker_ready(self): if not is_docker_ready(self.global_common):
message = "<b>Dangerzone requires Docker</b><br><br>Docker should be installed, but it looks like it's not running in the background.<br><br>Click Ok to try starting the docker service. You will have to type your login password." message = "<b>Dangerzone requires Docker</b><br><br>Docker should be installed, but it looks like it's not running in the background.<br><br>Click Ok to try starting the docker service. You will have to type your login password."
if ( if (
Alert(self, self.global_common, message).launch() Alert(self, self.global_common, message).launch()
@ -218,7 +218,7 @@ class GuiCommon(object):
) )
if p.returncode == 0: if p.returncode == 0:
# Make sure docker is now ready # Make sure docker is now ready
if is_docker_ready(self): if is_docker_ready(self.global_common):
return True return True
else: else:
message = "Restarting docker appeared to work, but the service still isn't responding, quitting." message = "Restarting docker appeared to work, but the service still isn't responding, quitting."
@ -234,7 +234,7 @@ class GuiCommon(object):
class Alert(QtWidgets.QDialog): class Alert(QtWidgets.QDialog):
def __init__( def __init__(
self, global_common, gui_common, message, ok_text="Ok", extra_button_text=None self, gui_common, global_common, message, ok_text="Ok", extra_button_text=None
): ):
super(Alert, self).__init__() super(Alert, self).__init__()
self.global_common = global_common self.global_common = global_common