Merge branch 'erp5' into erp5-z2.13

slapos/recipe/haproxy/__init__.py

@@ -112,8 +112,8 @@ class Recipe(GenericBaseRecipe):
       self.options['conf-path'],
       self.substituteTemplate(
         self.getTemplateFilename('haproxy.cfg.in'),
-        {'socket_path': self.options['socket-path']},
-        {'server_text': server_snippet},
+        {'socket_path': self.options['socket-path'],
+         'server_text': server_snippet},
       )
     )
     wrapper_path = self.createPythonScript(

slapos/recipe/librecipe/generic.py

@@ -156,7 +156,7 @@ class GenericBaseRecipe(object):
     if parameters_extra:
         # pass-through further parameters
         lines[-1] += ' \\'
-        lines.append('\t$@')
+        lines.append('\t"$@"')
 
     content = '\n'.join(lines) + '\n'
     return self.createFile(name, content, 0700)

slapos/recipe/wrapper.py

@@ -35,7 +35,7 @@ class Recipe(GenericBaseRecipe):
         wrapper_path = self.options['wrapper-path']
         wait_files = self.options.get('wait-for-files')
         environment = self.options.get('environment')
-        parameters_extra = self.options.get('parameters_extra')
+        parameters_extra = self.options.get('parameters-extra')
 
         if not wait_files and not environment:
           # Create a simple wrapper as shell script

software/jio/instance.cfg.in

@@ -46,4 +46,4 @@ LD_LIBRARY_PATH = ${libxslt:location}/lib:${libxml2:location}/lib:${zlib:locatio
 recipe = slapos.cookbook:wrapper
 command-line = ${phantomjs:location}/phantomjs-slapos
 wrapper-path = $${directory:bin}/phantomjs
-parameters_extra = true
+parameters-extra = true