Changeset 8218a3b


Ignore:
Timestamp:
Nov 3, 2009 3:29:02 PM (15 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:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/experiment_control.py

    r1da94bc r8218a3b  
    739739                    "Must have at least one SSH pubkey for services")
    740740
    741 
    742         for p, u in access_user:
     741        # Tweak search order so that if there are entries in access_user that
     742        # have a project matching the export project, we try them first
     743        if export_project and export_project.has_key('localname'):
     744            pn = export_project['localname']
     745               
     746            access_sequence = [ (p, u) for p, u in access_user if p == pn]
     747            access_sequence.extend([(p, u) for p, u in access_user if p != pn])
     748        else:
     749            access_sequence = access_user
     750
     751        for p, u in access_sequence:
    743752            self.log.debug(("[get_access] Attempting access from (%s, %s) " + \
    744753                    "to %s") %  ((p or "None"), u, uri))
Note: See TracChangeset for help on using the changeset viewer.