behave correctly when key_file or cert_file are not configured

182878c8 · Marco Mariani · e5420582 · 182878c8
Commit 182878c8 authored Apr 26, 2013 by Marco Mariani
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 2 deletions

slapos/client.py slapos/client.py +5 -2

No files found.
--- a/slapos/client.py
+++ b/slapos/client.py
@@ -71,8 +71,11 @@ class ClientConfig(object):
    else:
      setattr(self, 'master_url', master_url)

-    self.key_file = os.path.expanduser(self.key_file)
-    self.cert_file = os.path.expanduser(self.cert_file)
+    if self.key_file:
+        self.key_file = os.path.expanduser(self.key_file)
+
+    if self.cert_file:
+        self.cert_file = os.path.expanduser(self.cert_file)

 def init(config):
  """Initialize Slap instance, connect to server and create