git://git.onelab.eu
/
plcapi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (from parent 1:
a6e61b7
)
only use cert defined in /etc/planetlab/plc_config if url is not specified on the...
author
Mark Huang
<mlhuang@cs.princeton.edu>
Thu, 8 Feb 2007 21:49:24 +0000
(21:49 +0000)
committer
Mark Huang
<mlhuang@cs.princeton.edu>
Thu, 8 Feb 2007 21:49:24 +0000
(21:49 +0000)
PLC/Shell.py
patch
|
blob
|
history
diff --git
a/PLC/Shell.py
b/PLC/Shell.py
index
7f05023
..
f2aa211
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
#
# 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
#
import os
@@
-108,8
+108,8
@@
class Shell:
":" + str(self.config.PLC_API_PORT) + \
"/" + self.config.PLC_API_PATH + "/"
":" + 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:
self.url = url
if cacert is not None: