From: Tony Mack <tmack@paris.CS.Princeton.EDU>
Date: Tue, 3 May 2011 20:26:38 +0000 (-0400)
Subject: determine_rights() now supports 'authority+sa' and 'authority+ma' types
X-Git-Tag: sfa-1.0-21-ckp1~6
X-Git-Url: http://git.onelab.eu/?p=sfa.git;a=commitdiff_plain;h=457cfc8296aacfce33311a6e2ffb0d1e22ee9e7d

determine_rights() now supports 'authority+sa' and 'authority+ma' types
---

diff --git a/sfa/trust/rights.py b/sfa/trust/rights.py
index bb4dffe6..1d320a50 100644
--- a/sfa/trust/rights.py
+++ b/sfa/trust/rights.py
@@ -57,10 +57,10 @@ def determine_rights(type, name):
         rl.add("refresh")
         rl.add("resolve")
         rl.add("info")
-    elif type == "sa":
+    elif type in ["sa", "authority+sa"]:
         rl.add("authority")
         rl.add("sa")
-    elif type == "ma":
+    elif type ["ma", "authority+ma"]::
         rl.add("authority")
         rl.add("ma")
     elif type == "authority":