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

[nobody at svn.erp5.org]

Author: rafael
Date: Tue Mar 15 20:32:50 2011
New Revision: 44322

URL: http://svn.erp5.org?rev=44322&view=rev
Log:
Enable ERP5 Site creation and convert options to lists.

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=44322&r1=44321&r2=44322&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] Tue Mar 15 20:32:50 2011
@@ -33,8 +33,6 @@ import sys
 import zc.buildout
 import zc.recipe.egg
 
-CREATE_ERP5_SITE = 0
-
 # Taken from Zope2 egg
 def write_inituser(fn, user, password):
   fp = open(fn, "w")
@@ -72,8 +70,7 @@ class Recipe(BaseSlapRecipe):
         apache_login=self.installLoginApache(ip=self.getGlobalIPv6Address(),
           port=13000, backend=zope_access, key=ca_conf['login_key'],
           certificate=ca_conf['login_certificate']))
-    if CREATE_ERP5_SITE:
-      self.installERP5Site(user, password, zope_access,
+    self.installERP5Site(user, password, zope_access,
             mysql_conf, conversion_server_conf, memcached_conf, self.site_id)
     self.installTestRunner(ca_conf, mysql_conf, conversion_server_conf)
     self.linkBinary()
@@ -346,8 +343,9 @@ 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", '')
-    bt5_repository_list = self.options.get("bt5_repository_list", '')
+    bt5_url_list = self.options.get("bt5_url_list", '').split()
+    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,
                   sys.executable, self.wrapper_directory,