From 9f8c6bdda8ca6274e2d013d6528ab4ff83b35654 Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 18 Aug 2014 22:02:09 -0500 Subject: make the login not wait for eip it cannot-start-eip --- src/leap/bitmask/backend/components.py | 2 +- src/leap/bitmask/gui/mainwindow.py | 4 ++++ 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/leap/bitmask/backend/components.py b/src/leap/bitmask/backend/components.py index 960a922e..89f3c5a6 100644 --- a/src/leap/bitmask/backend/components.py +++ b/src/leap/bitmask/backend/components.py @@ -665,7 +665,7 @@ class EIP(object): return False client_cert_path = eip_config.\ - get_client_cert_path(provider_config, about_to_download=False) + get_client_cert_path(provider_config, about_to_download=True) if leap_certs.should_redownload(client_cert_path): logger.error("The client should redownload the certificate," diff --git a/src/leap/bitmask/gui/mainwindow.py b/src/leap/bitmask/gui/mainwindow.py index 8ce7f2fc..70a3f388 100644 --- a/src/leap/bitmask/gui/mainwindow.py +++ b/src/leap/bitmask/gui/mainwindow.py @@ -703,6 +703,10 @@ class MainWindow(QtGui.QMainWindow): self._eip_status.disable_eip_start() self._eip_status.set_eip_status(self.tr("Disabled")) + # this state flag is responsible for deferring the login + # so we must update it, otherwise we're in a deadlock. + self._trying_to_start_eip = False + @QtCore.Slot() def _disable_eip_missing_helpers(self): """ -- cgit v1.2.3 From 7259ec3425d58284961f675d5a4689681a68756a Mon Sep 17 00:00:00 2001 From: Kali Kaneko Date: Mon, 18 Aug 2014 22:30:07 -0500 Subject: changes file --- changes/bug_5994_do-not-wait-for-eip-if-cannot-start | 1 + 1 file changed, 1 insertion(+) create mode 100644 changes/bug_5994_do-not-wait-for-eip-if-cannot-start diff --git a/changes/bug_5994_do-not-wait-for-eip-if-cannot-start b/changes/bug_5994_do-not-wait-for-eip-if-cannot-start new file mode 100644 index 00000000..7ada612a --- /dev/null +++ b/changes/bug_5994_do-not-wait-for-eip-if-cannot-start @@ -0,0 +1 @@ +- Login shall not wait for eip to finish if eip is not able to start. Closes: #5994 -- cgit v1.2.3