Changeset 1e5e5ef

Timestamp:

May 15, 2009 4:23:49 PM (16 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

17382c7

Parents:

6a0b183

Message:

still finding the right place

Location:

fedd

Files:

• federation/LICENSE (deleted)
• federation/experiment_control.py (modified) (1 diff)
• setup.py (modified) (1 diff)

fedd/federation/experiment_control.py

@@ -1862 +1862 @@
             self.state_lock.acquire()
             if self.state.has_key(key):
-                try:
-                    kl = [ f['fedid'] for f in self.state[key]['experimentID']\
-                            if f.has_key('fedid') ]
-                except KeyError:
+                if isinstance(self.state[key], dict):
+                    try:
+                        kl = [ f['fedid'] for f in \
+                                self.state[key]['experimentID']\
+                                    if f.has_key('fedid') ]
+                    except KeyError:
+                        self.state_lock.release()
+                        raise service_error(service_error.internal, 
+                                "No fedid for experiment %s when checking " +\
+                                        "access(!?)" % key)
+                    if len(kl) == 1:
+                        key = kl[0]
+                    else:
+                        self.state_lock.release()
+                        raise service_error(service_error.internal, 
+                                "multiple fedids for experiment %s when " +\
+                                        "checking access(!?)" % key)
+                elif isinstance(self.state[key], str):
                     self.state_lock.release()
                     raise service_error(service_error.internal, 
-                            "No fedid for experiment %s when checking " +\
-                                    "access(!?)" % key)
-                if len(kl) == 1:
-                    key = kl[0]
+                            ("experiment %s is placeholder.  " +\
+                                    "Creation in progress or aborted oddly") \
+                                    % key)
                 else:
                     self.state_lock.release()
                     raise service_error(service_error.internal, 
-                            "multiple fedids for experiment %s when " +\
-                                    "checking access(!?)" % key)
+                            "Unexpected state for %s" % key)
+
             else:
                 self.state_lock.release()

fedd/setup.py

@@ -10 +10 @@
         url='http://fedd.isi.deterlab.net',
         packages=['federation'],
+        package_data={'federation': [ 'LICENSE' ]},
         requires=['ZSI(>=2.0)', 'M2Crypto'],
         provides=['federation'],