Typo

slapos/recipe/erp5_bootstrap/__init__.py

@@ -52,9 +52,9 @@ class Recipe(GenericBaseRecipe):
       python_path=sys.executable,
       user=zope_parsed.username,
       password=zope_parsed.password,
-      site-id=zope_parsed.split('/')[1],
+      site_id=zope_parsed.path.split('/')[1],
       host="%s:%s" % (zope_parsed.hostname, zope_parsed.port),
-      sql-connection-string=mysql_connection_string,
+      sql_connection_string=mysql_connection_string,
     )
 
     # Runners

slapos/recipe/erp5_bootstrap/template/erp5_bootstrap.in

@@ -4,15 +4,15 @@ import httplib
 import urllib
 import base64
 
-user = %(user)s
-password = %(password)s
-host = %(host)s
-site_id = %(site-id)s
+user = "%(user)s"
+password = "%(password)s"
+host = "%(host)s"
+site_id = "%(site_id)s"
 erp5_catalog_storage = 'erp5_mysql_innodb_catalog'
-mysql_url = %(sql-connection-string)s
+mysql_url = "%(sql_connection_string)s"
 
-header_dict = {'Authorization': 'Basic %s' % \
-  base64.encodestring('%s:%s' % (user, password)).strip()}
+header_dict = {'Authorization': 'Basic %%s' %% \
+  base64.encodestring('%%s:%%s' %% (user, password)).strip()}
 zope_connection = httplib.HTTPConnection(host)
 
 # Check if an ERP5 site is already created, as ERP5 does support having