Changeset c200d36 for fedd


Ignore:
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:
1 edited

Legend:

Unmodified
Added
Removed
  • fedd/federation/emulab_access.py

    rfa4a4a8 rc200d36  
    761761
    762762
    763     def configure_userconf(self, services):
     763    def configure_userconf(self, services, tmpdir):
    764764        """
    765765        If the userconf service was imported, collect the configuration data.
     
    793793                        raise service_error(service.error.internal,
    794794                                "Cannot create temp file for " +
    795                                 "userconfig certificates: %s e")
     795                                "userconfig certificates: %s" % e)
    796796                    except:
    797797                        t, v, st = sys.exc_info()
    798798                        raise service_error(service_error.internal,
    799                                 "Error retrieving %s: %s" % (s, v))
     799                                "Error retrieving %s: %s" % (u, v))
    800800                    finally:
    801801                        if tn: os.remove(tn)
     
    10761076
    10771077            # Set up userconf and seer if needed
    1078             self.configure_userconf(services)
     1078            self.configure_userconf(services, tmpdir)
    10791079            self.configure_seer_services(services, topo, softdir)
    10801080            # Get and send synch store variables
Note: See TracChangeset for help on using the changeset viewer.