Changeset 8218a3b

Timestamp:

Nov 3, 2009 3:29:02 PM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

axis_example, compt_changes, info-ops, master, version-2.00, version-3.01, version-3.02

Children:

829246e

Parents:

1da94bc

Message:

merge from 1.30: Adjust search order to check the exported project first.

File:

• fedd/federation/experiment_control.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -739 +739 @@
                     "Must have at least one SSH pubkey for services")
 
-
-        for p, u in access_user:
+        # Tweak search order so that if there are entries in access_user that 
+        # have a project matching the export project, we try them first 
+        if export_project and export_project.has_key('localname'): 
+            pn = export_project['localname'] 
+                
+            access_sequence = [ (p, u) for p, u in access_user if p == pn] 
+            access_sequence.extend([(p, u) for p, u in access_user if p != pn]) 
+        else: 
+            access_sequence = access_user 
+
+        for p, u in access_sequence: 
             self.log.debug(("[get_access] Attempting access from (%s, %s) " + \
                     "to %s") %  ((p or "None"), u, uri))