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
started to repair sfadump
[sfa.git]
/
sfa
/
trust
/
credential_legacy.py
diff --git
a/sfa/trust/credential_legacy.py
b/sfa/trust/credential_legacy.py
index
b868f2d
..
8ba90b2
100644
(file)
--- a/
sfa/trust/credential_legacy.py
+++ b/
sfa/trust/credential_legacy.py
@@
-223,24
+223,29
@@
class CredentialLegacy(Certificate):
#
# @param dump_parents If true, also dump the parent certificates
#
# @param dump_parents If true, also dump the parent certificates
- def dump(self,
dump_parents=False
):
- print
"CREDENTIAL", self.get_subject(
)
+ def dump(self,
*args, **kwargs
):
+ print
self.dump_string(*args,**kwargs
)
- print " privs:", self.get_privileges().save_to_string()
+ def dump_string(self, dump_parents=False):
+ result=""
+ result += "CREDENTIAL %s\n" % self.get_subject()
+
+ result += " privs: %s\n" % self.get_privileges().save_to_string()
- print " gidCaller:"
gidCaller = self.get_gid_caller()
if gidCaller:
gidCaller = self.get_gid_caller()
if gidCaller:
+ result += " gidCaller:\n"
gidCaller.dump(8, dump_parents)
gidCaller.dump(8, dump_parents)
- print " gidObject:"
gidObject = self.get_gid_object()
if gidObject:
gidObject = self.get_gid_object()
if gidObject:
- gidObject.dump(8, dump_parents)
+ result += " gidObject:\n"
+ result += gidObject.dump_string(8, dump_parents)
-
print " delegate:",
self.get_delegate()
+
result += " delegate: %s" %
self.get_delegate()
if self.parent and dump_parents:
if self.parent and dump_parents:
- print "PARENT",
-
self.parent.dump
(dump_parents)
+ result += "PARENT\n"
+
result += self.parent.dump_string
(dump_parents)
+ return result