git://git.onelab.eu
/
sfa.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
change SFA_BASE_DIR to SFA_DATA_DIR
[sfa.git]
/
sfa
/
plc
/
api.py
diff --git
a/sfa/plc/api.py
b/sfa/plc/api.py
index
5af31ec
..
7bfee91
100644
(file)
--- a/
sfa/plc/api.py
+++ b/
sfa/plc/api.py
@@
-175,7
+175,7
@@
class GeniAPI:
Get our credential from a remote registry using a geniclient connection
"""
type = 'authority'
Get our credential from a remote registry using a geniclient connection
"""
type = 'authority'
- path = self.config.SFA_
BASE
_DIR
+ path = self.config.SFA_
DATA
_DIR
filename = ".".join([self.interface, self.hrn, type, "cred"])
cred_filename = path + os.sep + filename
try:
filename = ".".join([self.interface, self.hrn, type, "cred"])
cred_filename = path + os.sep + filename
try:
@@
-245,7
+245,7
@@
class GeniAPI:
# see if this file exists
# XX This is really the aggregate's credential. Using this is easier than getting
# the registry's credential from iteslf (ssl errors).
# see if this file exists
# XX This is really the aggregate's credential. Using this is easier than getting
# the registry's credential from iteslf (ssl errors).
- ma_cred_filename = self.config.SFA_
BASE
_DIR + os.sep + self.interface + self.hrn + ".ma.cred"
+ ma_cred_filename = self.config.SFA_
DATA
_DIR + os.sep + self.interface + self.hrn + ".ma.cred"
try:
self.credential = Credential(filename = ma_cred_filename)
except IOError:
try:
self.credential = Credential(filename = ma_cred_filename)
except IOError: