Commit f872b22f authored by Rafael Monnerat's avatar Rafael Monnerat

Use only parameters and not try to get information from .cfg . The slapos master should contains such information, and never the .cfg itself.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44580 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 0633a4c1
...@@ -351,10 +351,8 @@ class Recipe(BaseSlapRecipe): ...@@ -351,10 +351,8 @@ class Recipe(BaseSlapRecipe):
mysql_connection_string = "%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s" % mysql_conf mysql_connection_string = "%(mysql_database)s@%(ip)s:%(tcp_port)s %(mysql_user)s %(mysql_password)s" % mysql_conf
# XXX URL list vs. repository + list of bt5 names? # XXX URL list vs. repository + list of bt5 names?
bt5_list = self.parameter_dict.get("bt5_list", bt5_list = self.parameter_dict.get("bt5_list", "").split()
self.options.get("bt5_list", '')).split() bt5_repository_list = self.parameter_dict.get("bt5_repository_list", "").split()
bt5_repository_list = self.parameter_dict.get("bt5_repository_list",
self.options.get("bt5_repository_list", '')).split()
self.path_list.extend(zc.buildout.easy_install.scripts([('erp5_update', self.path_list.extend(zc.buildout.easy_install.scripts([('erp5_update',
__name__ + '.erp5', 'updateERP5')], self.ws, __name__ + '.erp5', 'updateERP5')], self.ws,
......
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