From: Sandrine Avakian <sandrine.avakian@inria.fr>
Date: Tue, 29 May 2012 09:18:37 +0000 (+0200)
Subject: Merge branch 'master' into senslab2
X-Git-Tag: sfa-2.1-24~3^2~169
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=d4fdf5099eff793459ad956b6a40ff85003cecc0

Merge branch 'master' into senslab2

Conflicts:
	setup.py
---

d4fdf5099eff793459ad956b6a40ff85003cecc0
diff --cc setup.py
index 358b15e8,858802b9..eafced43
--- a/setup.py
+++ b/setup.py
@@@ -32,8 -32,7 +32,12 @@@ packages = 
      'sfa/generic',
      'sfa/managers',
      'sfa/importer',
-     'sfa/plc',
++
++
 +    'sfa/senslab',
++
+     'sfa/planetlab',
++
      'sfa/rspecs',
      'sfa/rspecs/elements',
      'sfa/rspecs/elements/versions',
diff --cc sfa/trust/auth.py
index bc4920d5,0c032792..41f42803
--- a/sfa/trust/auth.py
+++ b/sfa/trust/auth.py
@@@ -235,10 -231,10 +235,10 @@@ class Auth
              return
          #if name.startswith(get_authority(name)):
              #return
 -    
 +
          raise PermissionError(name)
  
-     def determine_user_rights(self, caller_hrn, record):
+     def determine_user_rights(self, caller_hrn, reg_record):
          """
          Given a user credential and a record, determine what set of rights the
          user should have to that record.