Merge branch 'sqlalchemy' of ssh://git.onelab.eu/git/sfa into sqlalchemy

diff --git a/sfa/client/sfaclientlib.py b/sfa/client/sfaclientlib.py
index 3f6f6bc..f4b9a7e 100644 (file)
--- a/sfa/client/sfaclientlib.py
+++ b/sfa/client/sfaclientlib.py
@@ -238,7 +238,7 @@ class SfaClientBootstrap:
     def authority_credential_filename (self, hrn): 
         return self.credential_filename(hrn,'authority')
     def my_gid_filename (self):
-        return self.gid_filename ("user", self.hrn)
+        return self.gid_filename (self.hrn, "user")
     def gid_filename (self, hrn, type): 
         return self.fullpath ("%s.%s.gid"%(hrn,type))
     

diff --git a/sfa/storage/model.py b/sfa/storage/model.py
index 7bb12aa..810af6b 100644 (file)
--- a/sfa/storage/model.py
+++ b/sfa/storage/model.py
@@ -176,6 +176,7 @@ class RegUser (RegRecord):
     def __repr__ (self): 
         result = RegRecord.__repr__(self).replace("Record","User")
         result.replace ("]"," email=%s"%self.email)
+        result += "]"
         return result
     
     @validates('email')