Merge branch 'master' into senslab2

[sfa.git] / sfa / client / sfaclientlib.py

diff --git a/sfa/client/sfaclientlib.py b/sfa/client/sfaclientlib.py
index 979fbbb..1253267 100644 (file)
--- a/sfa/client/sfaclientlib.py
+++ b/sfa/client/sfaclientlib.py
@@ -277,10 +277,8 @@ class SfaClientBootstrap:
                 except IOError:
                     raise 
                 except:
-                    import traceback
-                    traceback.print_exc()
+                    self.logger.log_exc("Could not produce/retrieve %s"%filename)
                     raise Exception, "Could not produce/retrieve %s"%filename
-            wrapped.__name__=f.__name__
             return wrapped
         return wrap
 
@@ -316,3 +314,8 @@ class SfaClientBootstrap:
     def authority_credential_string (self, hrn): 
         self.authority_credential(hrn)
         return self.plain_read(self.authority_credential_filename(hrn))
+
+    # for consistency
+    def private_key (self):
+        self.assert_private_key()
+        return self.private_key_filename()