Commit 3d134565 authored by Romain Courteaud's avatar Romain Courteaud

Reduce number of diff with the upstream

parent c6b7e8a7
......@@ -91,34 +91,6 @@ md5sum = 961d404f5726fce7c4d8b34d7e120077
output = ${buildout:directory}/template.cfg
mode = 0644
# # Release stabilisation
# [products-deps]
# # Recipe minitage.recipe.fetch is disabled, as it uses PATH variable, but it
# # is not possible to change its environment to use localy delivered subversion
# # nor git. plone.recipe.command can do same job, but it is controllable which
# # binary will be used
# recipe = plone.recipe.command
# svn_param =--trust-server-cert --non-interactive --quiet
# location = ${buildout:parts-directory}/${:_buildout_section_name_}
# stop-on-error = true
# command =
# ${subversion:location}/bin/svn checkout ${:svn_param} -r 98997 https://svn.plone.org/svn/collective/ExtFile/trunk ${:location}/ExtFile &&
# ${git:location}/bin/git clone --quiet git://git.hforge.org/Localizer.git ${:location}/Localizer && cd ${:location}/Localizer && ${git:location}/bin/git reset --quiet --hard dacb6ba0ae559cd9bdb8822812d24a12a21e9e37
# update-command =
#
# [erp5]
# # Recipe zerokspot.recipe.git is disabled, as is not possible to change its
# # environment to use localy delivered git.
# # plone.recipe.command can do same job, but it is controllable which binary
# # will be used
# recipe = plone.recipe.command
# location = ${buildout:parts-directory}/${:_buildout_section_name_}
# stop-on-error = true
# repository = https://saneftestbot:kucahS5oav6jahch@git.erp5.org/repos/erp5/sanef.git
# branch = CR1094
# # command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location}
# command = (${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location}) || (rm -fr ${:location} && exit 1)
# update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
[template-memcached]
recipe = slapos.recipe.template
url = ${:_profile_base_location_}/instance-memcached.cfg
......
......@@ -223,8 +223,8 @@ repository_id_list = sanef.repository erp5
recipe = plone.recipe.command
location = ${buildout:parts-directory}/${:_buildout_section_name_}
stop-on-error = true
repository = http://git.erp5.org/repos/erp5.git
branch = master
repository = https://saneftestbot:kucahS5oav6jahch@git.erp5.org/repos/erp5/sanef.git
branch = CR1094
revision =
command = ${git:location}/bin/git clone --quiet -b ${:branch} ${:repository} ${:location} && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [ -n ${:revision} ]; then cd ${:location} && ${git:location}/bin/git reset --quiet --hard ${:revision} ; fi
......
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