Commit 85cbd3fc authored by Jérome Perrin's avatar Jérome Perrin

Revert "erp5: Disable promises for Python3 until ERP5 has been ported."

This reverts commit 6c399134.
parent 8772b31f
...@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880 ...@@ -86,7 +86,7 @@ md5sum = 0ac4b74436f554cd677f19275d18d880
[template-zope] [template-zope]
filename = instance-zope.cfg.in filename = instance-zope.cfg.in
md5sum = e6c94c2a48788683bf0d63d135a44932 md5sum = 6170918945cffd0047afef2e1589923d
[template-balancer] [template-balancer]
filename = instance-balancer.cfg.in filename = instance-balancer.cfg.in
......
...@@ -366,17 +366,11 @@ instance-home = ${directory:instance} ...@@ -366,17 +366,11 @@ instance-home = ${directory:instance}
port = {{ port }} port = {{ port }}
[{{ section("promise-" ~ name) }}] [{{ section("promise-" ~ name) }}]
{% if six.PY3 -%}
# Disable the promise in Python 3. ERP5 is not compatible with Python 3 yet, so
# the promise would always fail.
recipe =
{% else -%}
<= monitor-promise-base <= monitor-promise-base
promise = check_socket_listening promise = check_socket_listening
name = {{ name }}.py name = {{ name }}.py
config-host = {{ ipv4 }} config-host = {{ ipv4 }}
config-port = {{ port }} config-port = {{ port }}
{% endif -%}
{% if use_ipv6 -%} {% if use_ipv6 -%}
[{{ zope_tunnel_section_name }}] [{{ zope_tunnel_section_name }}]
......
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