Commit cf1b4e9b authored by Arnaud Fontaine's avatar Arnaud Fontaine

Fix supervisor_controlled parameter for erp5_update script.

If erp5_update is controlled through supervisord, then put it in etc/run/
(slapgrid adds all the content of this directory to supervisord), otherwise,
put it in bin directory.
parent 8ee6f05f
......@@ -671,9 +671,12 @@ class Recipe(BaseSlapRecipe):
bt5_repository_list = self.parameter_dict.get("bt5_repository_list", "").split() \
or getattr(self, 'bt5_repository_list', [])
erp5_update_directory = supervisor_controlled and self.wrapper_directory or \
self.bin_directory
script = zc.buildout.easy_install.scripts([('erp5_update',
__name__ + '.erp5', 'updateERP5')], self.ws,
sys.executable, self.wrapper_directory,
sys.executable, erp5_update_directory,
arguments=[erp5_site_id,
mysql_connection_string,
[user, password, zope_access],
......@@ -683,8 +686,7 @@ class Recipe(BaseSlapRecipe):
bt5_list,
bt5_repository_list])
if supervisor_controlled:
self.path_list.extend(script)
self.path_list.extend(script)
return []
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment