Commit 0af0ad97 authored by Arnaud Fontaine's avatar Arnaud Fontaine

WIP: Cosmetics which should be squashed...

parent 141f85f1
...@@ -62,7 +62,6 @@ extends = ...@@ -62,7 +62,6 @@ extends =
../../software/neoppod/software-common.cfg ../../software/neoppod/software-common.cfg
# keep neoppod extends last # keep neoppod extends last
parts += parts +=
erp5-util-develop erp5-util-develop
slapos-cookbook slapos-cookbook
...@@ -422,7 +421,7 @@ egg = ${:_buildout_section_name_} ...@@ -422,7 +421,7 @@ egg = ${:_buildout_section_name_}
<= egg-with-zope-proxy <= egg-with-zope-proxy
[zope.container] [zope.container]
<= egg-with-zope-proxy <= egg-with-zope-proxy
setup-eggs += setup-eggs +=
${persistent:egg} ${persistent:egg}
[eggs] [eggs]
...@@ -584,7 +583,7 @@ eggs = ${neoppod:eggs} ...@@ -584,7 +583,7 @@ eggs = ${neoppod:eggs}
Record Record
# StructuredText # StructuredText
Zope Zope
# parameterizing the version of the generated python interpreter name by the # parameterizing the version of the generated python interpreter name by the
# python section version causes dependency between this egg section and the # python section version causes dependency between this egg section and the
# installation of python, which we don't want on an instance # installation of python, which we don't want on an instance
......
...@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941 ...@@ -34,7 +34,7 @@ md5sum = cfe4696a67bf4886a5d8252a5274a941
[template-zope-conf] [template-zope-conf]
filename = zope.conf.in filename = zope.conf.in
md5sum = c4bb59e56a29c4aaf5b2c2b92520e8f7 md5sum = fb02a30a9af9ef9a4724048c548b6542
[site-zcml] [site-zcml]
filename = site.zcml filename = site.zcml
......
[buildout]
# Version pins for required and commonly used dependencies.
[versions] [versions]
#Zope = 4.5.3 #Zope = 4.5.3
Zope2 = 4.0 Zope2 = 4.0
......
...@@ -81,7 +81,6 @@ trusted-proxy 0.0.0.0 ...@@ -81,7 +81,6 @@ trusted-proxy 0.0.0.0
{% endif %} {% endif %}
{% endif -%} {% endif -%}
{% set sql_connection_string = parameter_dict.get('sql-connection-string') -%} {% set sql_connection_string = parameter_dict.get('sql-connection-string') -%}
{% if sql_connection_string -%} {% if sql_connection_string -%}
{% set bt5_repository_url = [] -%} {% set bt5_repository_url = [] -%}
......
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