From aae98f640b6f552d23f11122fd0372012d9b5ed0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C5=81ukasz=20Nowak?= <luke@nexedi.com> Date: Fri, 17 Jun 2011 16:25:13 +0200 Subject: [PATCH] Fetch and activate z2loganalyser --- software/sanef/software.cfg | 29 ++++++++++++++++++++++++++--- 1 file changed, 26 insertions(+), 3 deletions(-) diff --git a/software/sanef/software.cfg b/software/sanef/software.cfg index 17d07cb45..c20841f9c 100644 --- a/software/sanef/software.cfg +++ b/software/sanef/software.cfg @@ -1,6 +1,7 @@ [buildout] develop = ${:parts-directory}/bef_erp5-recipe + ${:parts-directory}/z2loganalyser extends = ../../component/mysql-tritonn-5.0/buildout.cfg @@ -13,13 +14,16 @@ parts += bt5-bef bt5-repository checkrecipe + checkz2loganalyser [eggs] # Just so buildout executes [bef_erp5-recipe] before [eggs], as # - [eggs] references [bef_erp5-recipe] # - [instance-recipe] needs [bef_erp5-recipe] to be finished # - we cannot rely on anything else being executed before [eggs] -bef_dummy = ${bef_erp5-recipe:location} +bef_dummy = + ${bef_erp5-recipe:location} + ${z2loganalyser:location} # XXX: Workaround for hack; # slapos.core is added, as even if it is defined as dependency in bef_erp5-recipe @@ -27,6 +31,7 @@ bef_dummy = ${bef_erp5-recipe:location} # Note: Possibly everything from setup.py shall be done in same way. eggs += slapos.core + z2loganalyser extra-paths += ${products-erp5:location} @@ -35,16 +40,34 @@ extra-paths += url = ${:_profile_base_location_}/instance.cfg md5sum = 675df24f1d544f1d07e1efe4a3a0fe27 -[checkrecipe] +[eggcheck] recipe = plone.recipe.command stop-on-error = true update-command = ${:command} -command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link +command = grep parts ${buildout:develop-eggs-directory}/${:egg}.egg-link + +[checkrecipe] +<= eggcheck +egg = slapos.cookbook + +[checkz2loganalyser] +<= eggcheck +egg = z2loganalyser [instance-recipe] egg = slapos.cookbook module = bef_erp5 +[z2loganalyser] +recipe = plone.recipe.command +svn_param =--trust-server-cert --no-auth-cache --non-interactive --quiet -r 45666 +svn = ${subversion:location}/bin/svn +location = ${buildout:parts-directory}/${:_buildout_section_name_} +stop-on-error = true +update-command = ${:command} +command = + ${:svn} checkout ${:svn_param} https://svn.erp5.org/repos/public/erp5/trunk/utils/z2loganalyser/ ${:location} || exit 1 + [bef-svn-template] # Recipe infrae.subversion is using svn command under the hood, but there is # no way to pass --trust-server-cert --non-interactive, so in 2.12 falvour -- 2.30.9