Changeset 829246e


Ignore:
Timestamp:
Nov 3, 2009 3:34:24 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:
cbb6396
Parents:
8218a3b
Message:

Merge from 1.30: Multi info was all screwed up if the requester wasn't
authorized to see any one of the experiments. This gracefully handles the
exceptions that check_experiment_access throws. The 1.30 change included
making some Locks RLocks, but I don't think that's required.

File:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/experiment_control.py

    r8218a3b r829246e  
    23452345        self.state_lock.acquire()
    23462346        for key in [ k for k in self.state.keys() if isinstance(k, fedid)]:
    2347             self.check_experiment_access(fid, key)
     2347            try:
     2348                self.check_experiment_access(fid, key)
     2349            except service_error, e:
     2350                if e.code == service_error.access:
     2351                    continue
     2352                else:
     2353                    self.state_lock.release()
     2354                    raise e
    23482355
    23492356            if self.state.has_key(key):
Note: See TracChangeset for help on using the changeset viewer.