Call zc.recipe.egg correctly.

Initialise once with slapos.recipebox.
Do not use extras, as not required.

slapos/recipe/erp5/__init__.py

@@ -46,7 +46,7 @@ class Recipe(BaseSlapRecipe):
 
   def _install(self):
     self.path_list = []
-    self.requirements, self.ws = self.egg.working_set([__name__])
+    self.requirements, self.ws = self.egg.working_set()
     # self.cron_d is a directory, where cron jobs can be registered
     self.cron_d = self.installCrond()
     self.logrotate_d, self.logrotate_backup = self.installLogrotate()

slapos/recipe/erp5testnode/__init__.py

@@ -159,7 +159,7 @@ class Recipe(BaseSlapRecipe):
       os.symlink(destination, link)
 
   def _install(self):
-    self.requirements, self.ws = self.egg.working_set([__name__])
+    self.requirements, self.ws = self.egg.working_set()
     self.path_list = []
     self.installSlapOs()
     self.setupRunningWrapper()

slapos/recipe/librecipe.py

@@ -39,6 +39,7 @@ class BaseSlapRecipe:
   def __init__(self, buildout, name, options):
     """Default initialisation"""
     self.name = name
+    options['eggs'] = 'slapos.recipebox'
     self.options = options
     self.logger = logging.getLogger(self.name)
     self.slap = slap.slap()

slapos/recipe/slaprunner/__init__.py

@@ -33,11 +33,6 @@ import zc.recipe.egg
 
 
 class Recipe(BaseSlapRecipe):
-  def __init__(self, buildout, name, options):
-    BaseSlapRecipe.__init__(self, buildout, name, options)
-    options['eggs'] = 'slapos.recipe.slaprunner'
-    self.egg = zc.recipe.egg.Scripts(buildout, name, options)
-
   def _install(self):
     self.path_list = []
     self.requirements, self.ws = self.egg.working_set()

slapos/recipe/testnode/__init__.py

@@ -187,7 +187,7 @@ class Recipe(BaseSlapRecipe):
     return self.path_list
 
   def _install(self):
-    self.requirements, self.ws = self.egg.working_set([__name__])
+    self.requirements, self.ws = self.egg.working_set()
     self.path_list = []
     self.installSlapOs()
     self.installLocalZip()

slapos/recipe/vifib.py

@@ -246,7 +246,7 @@ SSLCARevocationPath %(ca_crl)s"""
     self.site_check_path = '/%s/getId' % self.site_id
     self.key_auth_path = '/%s/portal_slap' % self.site_id
     self.path_list = []
-    self.requirements, self.ws = self.egg.working_set([__name__])
+    self.requirements, self.ws = self.egg.working_set()
     # self.cron_d is a directory, where cron jobs can be registered
     self.cron_d = self.installCrond()
     self.logrotate_d, self.logrotate_backup = self.installLogrotate()