summaryrefslogtreecommitdiff
path: root/src/leap/keymanager/__init__.py
diff options
context:
space:
mode:
authorRuben Pollan <meskio@sindominio.net>2015-09-24 12:19:36 +0200
committerRuben Pollan <meskio@sindominio.net>2015-09-24 12:19:36 +0200
commitbad4662976e46047654d9b610f0e8517a43bfcc6 (patch)
tree9d9cd01f75c0b2734561ca74bfff43d1b157b18f /src/leap/keymanager/__init__.py
parent1b805754f1d6efe9af25dcf0ab60b3aa2100ee20 (diff)
parent3da04e10ce961e2606ce00125d092d9daa621636 (diff)
Merge branch 'fix_empty_string_ca_certs' into develop
Diffstat (limited to 'src/leap/keymanager/__init__.py')
-rw-r--r--src/leap/keymanager/__init__.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/src/leap/keymanager/__init__.py b/src/leap/keymanager/__init__.py
index e378c91..cf099bb 100644
--- a/src/leap/keymanager/__init__.py
+++ b/src/leap/keymanager/__init__.py
@@ -148,7 +148,7 @@ class KeyManager(object):
if self._ca_cert_path == leap_ca_bundle:
return self._ca_cert_path # don't merge file with itself
- elif self._ca_cert_path is None:
+ elif not self._ca_cert_path:
return leap_ca_bundle
# file is auto deleted when python process ends