X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=blobdiff_plain;f=sfa%2Ftrust%2Fcredential.py;h=4e1fe0f199323b0ed3a184acf1fe140fa75c8779;hp=63233d2bb31db5cb909223242d76baa7299152e0;hb=ea995a055eba04aedff577e86652abaaa5e881aa;hpb=70f87e73b1c1d953cdedbd164f9bf1a2ae0a726e diff --git a/sfa/trust/credential.py b/sfa/trust/credential.py index 63233d2b..4e1fe0f1 100644 --- a/sfa/trust/credential.py +++ b/sfa/trust/credential.py @@ -828,23 +828,25 @@ class Credential(object): # # @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() - - print " gidCaller:" + 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() gidCaller = self.get_gid_caller() if gidCaller: - gidCaller.dump(8, dump_parents) + result += " gidCaller:\n" + result += gidCaller.dump_string(8, dump_parents) - print " gidObject:" gidObject = self.get_gid_object() if gidObject: - gidObject.dump(8, dump_parents) - + result += " gidObject:\n" + result += gidObject.dump_string(8, dump_parents) if self.parent and dump_parents: - print "PARENT", - self.parent.dump_parents() + result += "PARENT" + result += self.parent.dump_string(dump_parents) + return result