From: Mark Huang <mlhuang@cs.princeton.edu>
Date: Thu, 8 Feb 2007 21:49:24 +0000 (+0000)
Subject: only use cert defined in /etc/planetlab/plc_config if url is not specified on the... 
X-Git-Tag: PLCAPI-4.2-0~201
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=2768ae423859246bab1918512e15a34487233e2f;p=plcapi.git

only use cert defined in /etc/planetlab/plc_config if url is not specified on the command line
---

diff --git a/PLC/Shell.py b/PLC/Shell.py
index 7f05023..f2aa211 100644
--- 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,v 1.4 2007/02/02 04:38:28 mlhuang Exp $
 #
 
 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: