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

[nobody at svn.erp5.org]

Author: rafael
Date: Thu Mar 24 17:56:06 2011
New Revision: 44580

URL: http://svn.erp5.org?rev=44580&view=rev
Log:

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

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=44580&r1=44579&r2=44580&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] Thu Mar 24 17:56:06 2011
@@ -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
 
     # XXX URL list vs. repository + list of bt5 names?
-    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()
+    bt5_list = self.parameter_dict.get("bt5_list", "").split()
+    bt5_repository_list = self.parameter_dict.get("bt5_repository_list", "").split()
 
     self.path_list.extend(zc.buildout.easy_install.scripts([('erp5_update',
             __name__ + '.erp5', 'updateERP5')], self.ws,