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
fix speaks for auth
[sfa.git]
/
sfa
/
trust
/
credential.py
diff --git
a/sfa/trust/credential.py
b/sfa/trust/credential.py
index
78fba52
..
9a45400
100644
(file)
--- a/
sfa/trust/credential.py
+++ b/
sfa/trust/credential.py
@@
-826,7
+826,7
@@
class Credential(object):
trusted_cert_objects.append(GID(filename=f))
ok_trusted_certs.append(f)
except Exception, exc:
trusted_cert_objects.append(GID(filename=f))
ok_trusted_certs.append(f)
except Exception, exc:
- logger.error("Failed to load trusted cert from %s: %r"
, f, exc
)
+ logger.error("Failed to load trusted cert from %s: %r"
%( f, exc)
)
trusted_certs = ok_trusted_certs
# Use legacy verification if this is a legacy credential
trusted_certs = ok_trusted_certs
# Use legacy verification if this is a legacy credential
@@
-1056,8
+1056,8
@@
class Credential(object):
def dump (self, *args, **kwargs):
print self.dump_string(*args, **kwargs)
def dump (self, *args, **kwargs):
print self.dump_string(*args, **kwargs)
-
- def dump_string(self, dump_parents=False):
+ # show_xml is ignored
+ def dump_string(self, dump_parents=False
, show_xml=None
):
result=""
result += "CREDENTIAL %s\n" % self.get_subject()
filename=self.get_filename()
result=""
result += "CREDENTIAL %s\n" % self.get_subject()
filename=self.get_filename()