Merge remote-tracking branch 'origin/pycurl' into planetlab-4_0-branch

[plcapi.git] / PLC / Shell.py

diff --git a/PLC/Shell.py b/PLC/Shell.py
index 7f05023..43317a0 100644 (file)
--- a/PLC/Shell.py
+++ b/PLC/Shell.py
@@ -5,7 +5,7 @@
 # Mark Huang <mlhuang@cs.princeton.edu>
 # Copyright (C) 2005 The Trustees of Princeton University
 #
-# $Id: Shell.py,v 1.3 2007/01/16 16:25:12 thierry Exp $
+# $Id: Shell.py 5574 2007-10-25 20:33:17Z thierry $
 #
 
 import os
@@ -108,8 +108,8 @@ class Shell:
                       ":" + str(self.config.PLC_API_PORT) + \
                       "/" + self.config.PLC_API_PATH + "/"
 
-            if cacert is None and self.config is not None:
-                cacert = self.config.PLC_API_CA_SSL_CRT
+                if cacert is None:
+                    cacert = self.config.PLC_API_CA_SSL_CRT
 
             self.url = url
             if cacert is not None: