Commit 0f62d562 authored by Vincent Pelletier's avatar Vincent Pelletier

stack.erp5: Fix instance upgrade from slapos.cookbook:generic.zope.zeo.client

slapos.cookbook:generic.zope.zeo.client did not let buildout know about
site.zcml file it creates. So it would not be deleted on update, making
slapos.cookbook:symbolic.link fail as it carefully avoids deleting
non-links.
So, copy site.zcml instead of sym-linking.
parent dc5d04a6
...@@ -342,7 +342,7 @@ md5sum = b0cb0ee97cddc79112a718e065806037 ...@@ -342,7 +342,7 @@ md5sum = b0cb0ee97cddc79112a718e065806037
[template-zope] [template-zope]
<= download-base <= download-base
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = 44773d69f85b605176f16df7d7bb8d97 md5sum = e63ff201ee11567d35017314862f4ef3
link-binary = link-binary =
${aspell:location}/bin/aspell ${aspell:location}/bin/aspell
${dmtx-utils:location}/bin/dmtxwrite ${dmtx-utils:location}/bin/dmtxwrite
......
...@@ -199,9 +199,9 @@ parameters-extra = true ...@@ -199,9 +199,9 @@ parameters-extra = true
command-line = '{{ parameter_dict['userhosts'] }}' '{{ bin_directory }}/runzope' -C '${:configuration-file}' command-line = '{{ parameter_dict['userhosts'] }}' '{{ bin_directory }}/runzope' -C '${:configuration-file}'
[{{ section('zcml') }}] [{{ section('zcml') }}]
recipe = slapos.cookbook:symbolic.link recipe = slapos.cookbook:copyfilelist
target-directory = ${directory:instance-etc} target-directory = ${directory:instance-etc}
link-binary = {{ parameter_dict['site-zcml'] }} file-list = {{ parameter_dict['site-zcml'] }}
[{{ section('zope-inituser') }}] [{{ section('zope-inituser') }}]
recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
......
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