Changeset c200d36

Timestamp:

May 28, 2010 6:40:43 AM (14 years ago)

Author:

Ted Faber <faber@…>

Branches:

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

Children:

6abed7b

Parents:

fa4a4a8

Message:

Whoops.

File:

• fedd/federation/emulab_access.py (modified) (3 diffs)

fedd/federation/emulab_access.py

@@ -761 +761 @@
 
 
-    def configure_userconf(self, services):
+    def configure_userconf(self, services, tmpdir):
         """
         If the userconf service was imported, collect the configuration data.
@@ -793 +793 @@
                         raise service_error(service.error.internal, 
                                 "Cannot create temp file for " + 
-                                "userconfig certificates: %s e")
+                                "userconfig certificates: %s" % e)
                     except:
                         t, v, st = sys.exc_info()
                         raise service_error(service_error.internal,
-                                "Error retrieving %s: %s" % (s, v))
+                                "Error retrieving %s: %s" % (u, v))
                     finally:
                         if tn: os.remove(tn)
@@ -1076 +1076 @@
 
             # Set up userconf and seer if needed
-            self.configure_userconf(services)
+            self.configure_userconf(services, tmpdir)
             self.configure_seer_services(services, topo, softdir)
             # Get and send synch store variables