diff options
author | Kali Kaneko <kali@leap.se> | 2015-02-05 15:22:37 -0400 |
---|---|---|
committer | Kali Kaneko <kali@leap.se> | 2015-02-05 15:22:37 -0400 |
commit | 8de591e85db21c8a189336c630408abdf7c85b1b (patch) | |
tree | 82d9fd7daebe5ee0a1bd5d099e8249ca97340508 /src/leap/bitmask/services/eip/eipbootstrapper.py | |
parent | e2043a930b9ef98ad68746a2f21585901117892a (diff) | |
parent | 1fa295ecd6af5c2ea64e76418bd144f9ddf4c803 (diff) |
Merge tag '0.8.0' into debian/experimental
Tag leap.bitmask version 0.8.0
Conflicts:
pkg/requirements.pip
src/leap/bitmask/gui/mainwindow.py
Diffstat (limited to 'src/leap/bitmask/services/eip/eipbootstrapper.py')
-rw-r--r-- | src/leap/bitmask/services/eip/eipbootstrapper.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/src/leap/bitmask/services/eip/eipbootstrapper.py b/src/leap/bitmask/services/eip/eipbootstrapper.py index 264eac2e..f78113bc 100644 --- a/src/leap/bitmask/services/eip/eipbootstrapper.py +++ b/src/leap/bitmask/services/eip/eipbootstrapper.py @@ -115,10 +115,15 @@ class EIPBootstrapper(AbstractBootstrapper): self._provider_config = provider_config self._download_if_needed = download_if_needed + eip_config_ready = None + eip_certificate_ready = None + if self._signaler is not None: + eip_config_ready = self._signaler.eip_config_ready + eip_certificate_ready = self._signaler.eip_client_certificate_ready + cb_chain = [ - (self._download_config, self._signaler.eip_config_ready), - (self._download_client_certificates, - self._signaler.eip_client_certificate_ready) + (self._download_config, eip_config_ready), + (self._download_client_certificates, eip_certificate_ready) ] return self.addCallbackChain(cb_chain) |