summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTomás Touceda <chiiph@leap.se>2014-08-19 10:04:34 -0300
committerTomás Touceda <chiiph@leap.se>2014-08-19 10:04:34 -0300
commit1c952600d7d8a6f22a7952ed5131b04e9c8d5f34 (patch)
tree9c588d43fe74b9ca30f1d8d58ce1d270545561e5
parent1f3c0a840e5f8aebebc6d393c31e0d85cfbf811e (diff)
parent7259ec3425d58284961f675d5a4689681a68756a (diff)
Merge remote-tracking branch 'refs/remotes/kali/bug/do-not-wait-for-eip-if-cannot-start' into develop
-rw-r--r--changes/bug_5994_do-not-wait-for-eip-if-cannot-start1
-rw-r--r--src/leap/bitmask/backend/components.py2
-rw-r--r--src/leap/bitmask/gui/mainwindow.py4
3 files changed, 6 insertions, 1 deletions
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
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):
"""