[Erp5-report] r44363 rafael - /erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/

[nobody at svn.erp5.org]

Author: rafael
Date: Wed Mar 16 16:43:03 2011
New Revision: 44363

URL: http://svn.erp5.org?rev=44363&view=rev
Log:
Prefer get information provided from instance parameter dict rather them options (.cfg),
This permit user define some set of bt5s which should be installed.

Modified:
    erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py

Modified: erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py
URL: http://svn.erp5.org/erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py?rev=44363&r1=44362&r2=44363&view=diff
==============================================================================
--- erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] (original)
+++ erp5/trunk/utils/slapos.recipe.erp5/src/slapos/recipe/erp5/__init__.py [utf8] Wed Mar 16 16:43:03 2011
@@ -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 []