Commit 163880c7 authored by Julien Muchembled's avatar Julien Muchembled

erp5: make 'list +=' usable when extending [local-bt5-repository]

parent 81ca71cb
......@@ -60,8 +60,7 @@ initialization =
repository_id_list += wendelin
[local-bt5-repository]
# we need to override it
list = ${erp5:location}/bt5 ${erp5:location}/product/ERP5/bootstrap ${wendelin:location}/bt5/
list += ${wendelin:location}/bt5
# Jupyter is by default enabled in Wendelin
[erp5-defaults]
......
......@@ -384,7 +384,7 @@ recipe = plone.recipe.command
stop-on-error = true
genbt5list = ${erp5:location}/product/ERP5/bin/genbt5list
command =
${buildout:executable} ${:genbt5list} ${local-bt5-repository:list}
echo '${local-bt5-repository:list}' |xargs ${buildout:executable} ${:genbt5list}
update-command = ${:command}
[erp5_repository_list]
......
......@@ -79,7 +79,7 @@ md5sum = 0969fbb25b05c02ef3c2d437b2f4e1a0
[template]
filename = instance.cfg.in
md5sum = cbe1df5dbd9b79ed7adc027fd183e186
md5sum = 7b4ebfd2ef31ed57a7129020c8ccde67
[monitor-template-dummy]
filename = dummy.cfg
......
......@@ -73,7 +73,7 @@ extra-context =
[dynamic-template-erp5-parameters]
jupyter-enable-default = {{ jupyter_enable_default }}
local-bt5-repository = {{ local_bt5_repository }}
local-bt5-repository = {{ ' '.join(local_bt5_repository.split()) }}
  • What about joining with '\0', using dumps on the result and using xargs -0 ?

  • ...then again, as we call split anyway, paths with white-spaces will be broken anyway so I guess null-join is meaningless. I'm still bothered by the lack of path safety everywhere in slapos, and I would like all tests to happen with both software and instance paths under a " ${couscous:blabla}" folder (space intended), so any accidental lack of escaping and any lack of whitespace handling becomes visible.

Please register or sign in to reply
template-monitor = {{ dumps(template_monitor) }}
[dynamic-template-erp5]
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment