Commit 38417299 authored by Rafael Monnerat's avatar Rafael Monnerat

Prefer get information provided from instance parameter dict rather them options (.cfg),

This permit user define some set of bt5s which should be installed.

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@44363 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent c88e12b1
......@@ -343,8 +343,10 @@ class Recipe(BaseSlapRecipe):
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?
bt5_url_list = self.options.get("bt5_url_list", '').split()
bt5_repository_list = self.options.get("bt5_repository_list", '').split()
bt5_list = self.parameter_dict.get("bt5_list",
self.options.get("bt5_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',
__name__ + '.erp5', 'updateERP5')], self.ws,
......@@ -355,7 +357,7 @@ class Recipe(BaseSlapRecipe):
memcached_conf['memcached_url'],
conversion_server_conf['conversion_server_ip'],
conversion_server_conf['conversion_server_port'],
bt5_url_list,
bt5_list,
bt5_repository_list]))
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