Commit 4b11eb7d authored by Vincent Pelletier's avatar Vincent Pelletier

erp5: Make "config" macro parameter mandatory.

It's already always provided, and looks dangerous: it is mutated during
execution.
parent 91816390
...@@ -272,7 +272,7 @@ extra-context = ...@@ -272,7 +272,7 @@ extra-context =
[template-erp5] [template-erp5]
< = download-base < = download-base
filename = instance-erp5.cfg.in filename = instance-erp5.cfg.in
md5sum = 96d3611ffc0f6a6664cc2e9824adacdd md5sum = fabf98dcb9e3d0fa8236397d69293528
[template-neo] [template-neo]
< = download-base < = download-base
......
...@@ -18,7 +18,7 @@ config = ...@@ -18,7 +18,7 @@ config =
extra-config = extra-config =
config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }} config-use-ipv6 = {{ dumps(slapparameter_dict.get('use-ipv6', False)) }}
{% macro request(name, software_type, config_key, config={}, ret={'url': True}) -%} {% macro request(name, software_type, config_key, config, ret={'url': True}) -%}
{% do config.update(slapparameter_dict.get(config_key, {})) -%} {% do config.update(slapparameter_dict.get(config_key, {})) -%}
{% set section = 'request-' ~ name -%} {% set section = 'request-' ~ name -%}
[{{ section }}] [{{ section }}]
......
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