Update release candidate

CHANGES.rst

 Changes
 =======
 
+1.0.59 (2018-03-15)
+-------------------
+* librecipe.execute: fix convert process arguments to string formatting.
+
 1.0.58 (2018-03-14)
 -------------------
 

component/logrotate/buildout.cfg

@@ -11,7 +11,7 @@ url = https://github.com/logrotate/logrotate/releases/download/3.11.0/logrotate-
 md5sum = 3a9280e4caeb837427a2d54518fbcdac
 # BBB this is only for backward-compatibility.
 post-install =
-  ln -sf . ${buildout:parts-directory}/${:_buildout_section_name_}/usr
+  ln -nsf . ${buildout:parts-directory}/${:_buildout_section_name_}/usr
 environment =
   PATH=${xz-utils:location}/bin:%(PATH)s
   CPPFLAGS=-I${popt:location}/include

component/nodejs/buildout.cfg

@@ -68,9 +68,9 @@ environment =
 [nodejs-0.12]
 # Server-side Javascript.
 recipe = slapos.recipe.cmmi
-version = v0.12.12
+version = v0.12.18
 url = http://nodejs.org/dist/${:version}/node-${:version}.tar.gz
-md5sum = 366f3f65352e6887cc6c06aa96c25c3c
+md5sum = 1292af0584de9ba773eb06120b5ddb86
 configure-options =
   --openssl-includes=${openssl:location}/include
   --openssl-libpath=${openssl:location}/lib

component/userhosts/buildout.cfg

@@ -13,6 +13,6 @@ location = ${userhosts-get:location}/userhosts
 [userhosts-get]
 recipe = slapos.recipe.build:gitclone
 repository = https://lab.nexedi.com/nexedi/userhosts.git
-revision = 48241da33416ef76097c9cdd6c70b8a57b4b69a8
+revision = 1d3b463e7856db6e674a06258c0840206e6a7b72
 git-executable = ${git:location}/bin/git
 location = ${buildout:parts-directory}/userhosts

setup.py

@@ -28,7 +28,7 @@ from setuptools import setup, find_packages
 import glob
 import os
 
-version = '1.0.58'
+version = '1.0.59'
 name = 'slapos.cookbook'
 long_description = open("README.rst").read() + "\n" + \
     open("CHANGES.rst").read() + "\n"

slapos/recipe/librecipe/execute.py

@@ -116,7 +116,7 @@ def execute_with_signal_translation(args):
   child = subprocess.Popen(args, close_fds=True, preexec_fn=os.setsid)
   child_pg = child.pid
   try:
-    print 'Process %r started' % args
+    print 'Process %r started' % (args, )
     signal.pause()
   finally:
     os.killpg(child_pg, signal.SIGHUP)

software/slaprunner/buildout.hash.cfg

@@ -23,7 +23,7 @@ md5sum = 16ff762e71c92f8a8e1062906eb10b9c
 
 [template-runner-import-script]
 filename = template/runner-import.sh.jinja2
-md5sum = 1edd9c7a20e208b6cb647886bfb6d1bb
+md5sum = 948a4a5fcb244131847e5df8480678e1
 
 [instance-runner-import]
 filename = instance-runner-import.cfg.in

software/slaprunner/template/runner-import.sh.jinja2

@@ -14,7 +14,7 @@ exec 2>&1
 echo -e "\n\n$0 run at : $(date)"
 
 srv_directory='{{ directory["srv"] }}'
-backup_directory='{{ directory["backup"] }}'
+backup_directory='{{ directory["backup"] }}/../'
 etc_directory='{{ directory["etc"] }}'
 
 RESTORE_EXIT_CODE_FILE='{{ restore_exit_code_file }}'

stack/erp5/buildout.hash.cfg

@@ -27,7 +27,7 @@ md5sum = 1af531c51f575a1d1362f2ca2d61620d
 
 [template-mariadb]
 filename = instance-mariadb.cfg.in
-md5sum = 705f017e19dc2d1048770284d1d6b31f
+md5sum = 06e4e35e2a9ed3c6a611938ff3bc3b65
 
 [template-kumofs]
 filename = instance-kumofs.cfg.in
@@ -87,7 +87,7 @@ md5sum = d1f33d406d528ae27d973e2dd0efb1ba
 
 [template-zope]
 filename = instance-zope.cfg.in
-md5sum = 490001726c0dd93cc94960d83a2f08e5
+md5sum = 6aec575a632a2a2672a54bcaedae81cb
 
 [template-balancer]
 filename = instance-balancer.cfg.in

stack/erp5/instance-mariadb.cfg.in

@@ -292,7 +292,7 @@ context =
 # Generate after import script used by importer instance of webrunner
 < = jinja2-template-executable
 template = {{ parameter_dict['mariadb-resiliency-after-import-script'] }}
-rendered = ${directory:srv}/runner-import-restore
+rendered = ${directory:bin}/restore-from-backup
 context =
   key dash dash:dash
   key mysql_executable binary-wrap-mysql:wrapper-path

stack/erp5/instance-zope.cfg.in

@@ -30,12 +30,22 @@ memcached-url = {{ dumps(slapparameter_dict['memcached-url']) }}
 cloudooo-url = {{ dumps(slapparameter_dict['cloudooo-url']) }}
 test-instance-path = ${directory:unit-test-path}
 prepend-path = ${buildout:bin-directory}
-run-unit-test = ${buildout:bin-directory}/runUnitTest
-run-test-suite = ${buildout:bin-directory}/runTestSuite
+run-unit-test = ${buildout:bin-directory}/runUnitTest.real
+run-test-suite = ${buildout:bin-directory}/runTestSuite.real
 openssl-binary = ${test-certificate-authority:openssl-binary}
 run-unit-test-binary = {{ parameter_dict['bin-directory'] }}/runUnitTest
 run-test-suite-binary = {{ parameter_dict['bin-directory'] }}/runTestSuite
 
+[{{ section('run-unit-test-userhosts-wrapper') }}]
+<= userhosts-wrapper-base
+wrapped-command-line = ${test-runner:run-unit-test}
+wrapper-path = ${buildout:bin-directory}/runUnitTest
+
+[{{ section('run-test-suite-userhosts-wrapper') }}]
+<= userhosts-wrapper-base
+wrapped-command-line = ${test-runner:run-test-suite}
+wrapper-path = ${buildout:bin-directory}/runTestSuite
+
 [test-certificate-authority]
 recipe = slapos.cookbook:certificate_authority
 openssl-binary = ${binary-link:target-directory}/openssl
@@ -168,6 +178,14 @@ template = inline: {{ '
 rendered = ${directory:etc}/hosts
 context = key host_dict hosts-parameter:host-dict
 
+[userhosts-wrapper-base]
+recipe = slapos.cookbook:wrapper
+environment =
+  HOSTALIASES=${hostaliases:rendered}
+  HOSTS=${hosts:rendered}
+parameters-extra = true
+command-line = '{{ parameter_dict['userhosts'] }}' ${:wrapped-command-line}
+
 {# Hack to deploy SSL certs via instance parameters -#}
 {% for zodb in zodb_dict.itervalues() -%}
 {%   set storage_dict = zodb.setdefault('storage-dict', {}) -%}
@@ -190,10 +208,8 @@ pem = {{dumps(storage_dict.pop(k))}}
 {# endhack -#}
 
 [runzope-base]
-recipe = slapos.cookbook:wrapper
-environment =
-  HOSTALIASES=${hostaliases:rendered}
-  HOSTS=${hosts:rendered}
+<= userhosts-wrapper-base
+environment +=
   TMP=${directory:tmp}
   TMPDIR=${directory:tmp}
   HOME=${buildout:directory}
@@ -204,8 +220,7 @@ environment =
 {% if slapparameter_dict.get('wendelin-core-zblk-fmt') %}
   WENDELIN_CORE_ZBLK_FMT={{ slapparameter_dict['wendelin-core-zblk-fmt'] }}
 {% endif %}
-parameters-extra = true
-command-line = '{{ parameter_dict['userhosts'] }}' '{{ bin_directory }}/runzope' -C '${:configuration-file}'
+wrapped-command-line = '{{ bin_directory }}/runzope' -C '${:configuration-file}'
 private-dev-shm = {{ slapparameter_dict['private-dev-shm'] }}
 
 [{{ section('zcml') }}]

stack/slapos.cfg

@@ -127,7 +127,7 @@ pyparsing = 2.2.0
 pytz = 2016.10
 requests = 2.13.0
 six = 1.10.0
-slapos.cookbook = 1.0.58
+slapos.cookbook = 1.0.59
 slapos.core = 1.4.4
 slapos.extension.strip = 0.4
 slapos.libnetworkcache = 0.15
@@ -156,7 +156,7 @@ functools32 = 3.2.3.post2
 ipaddress = 1.0.18
 
 # Required by:
-# slapos.cookbook==1.0.58
+# slapos.cookbook==1.0.59
 jsonschema = 2.6.0
 
 # Required by: