From 1ce121d774d48a38fe99ed1d468b423c89af9956 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=A9dric=20de=20Saint=20Martin?= <cedric.dsm@tiolive.com>
Date: Thu, 9 Jun 2011 11:24:32 +0200
Subject: [PATCH] memcached : remove develop-egg and set version for
slapos.cookbook
---
software/memcached/software.cfg | 31 +++----------------------------
1 file changed, 3 insertions(+), 28 deletions(-)
diff --git a/software/memcached/software.cfg b/software/memcached/software.cfg
index e409640af..6803b712a 100644
--- a/software/memcached/software.cfg
+++ b/software/memcached/software.cfg
@@ -1,7 +1,4 @@
[buildout]
-slaposcookbook_recipe_location = ${:parts-directory}/slaposcookbook
-develop =
- ${:slaposcookbook_recipe_location}
extensions =
slapos.zcbworkarounds
@@ -11,7 +8,6 @@ find-links +=
http://www.nexedi.org/static/packages/source/slapos.buildout/
extends =
- ../../component/git/buildout.cfg
../../component/memcached/buildout.cfg
../../component/python-2.7/buildout.cfg
../../component/dcron/buildout.cfg
@@ -28,7 +24,6 @@ parts =
libxslt
eggs
instance-recipe-egg
- checkrecipe
# XXX: Workaround of SlapOS limitation
# Unzippig of eggs is required, as SlapOS do not yet provide nicely working
@@ -45,11 +40,6 @@ egg = slapos.cookbook
module = memcached
[instance-recipe-egg]
-# Just so buildout executes [slaposcookbook] before [eggs], as
-# - [eggs] references [slaposcookbook]
-# - [instance-recipe] needs [slaposcookbook] to be finished
-# - we cannot rely on anything else being executed before [instance-recipe]
-slaposcookbook_dummy = ${slaposcookbook:location}
recipe = zc.recipe.egg
python = python2.7
eggs = ${instance-recipe:egg}
@@ -68,30 +58,15 @@ md5sum = 837caf9897332a5f70c72438f1dc5bae
output = ${buildout:directory}/template.cfg
mode = 0644
-[slaposcookbook]
-recipe = plone.recipe.command
-branch = memcached
-git_param =--quiet -b ${:branch}
-git = ${git:location}/bin/git
-location = ${buildout:parts-directory}/${:_buildout_section_name_}
-stop-on-error = true
-command = ${:git} clone ${:git_param} http://git.erp5.org/repos/slapos.git ${:location} || exit 1;
-update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
-
-[checkrecipe]
-recipe = plone.recipe.command
-stop-on-error = true
-update-command = ${:command}
-command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
-
[versions]
-slapos.core = 0.2
+slapos.cookbook = 0.4
+# Required by slapos.cookbook==0.4
+slapos.core = 0.2
collective.recipe.template = 1.8
slapos.slap = 1.2.dev-r4679
netaddr = 0.7.5
xml-marshaller = 0.9.7
-
setuptools = 0.6c12dev-r88795
hexagonit.recipe.cmmi = 1.5.0
--
2.30.9