Merge branch 'cloudooo' of https://git.erp5.org/repos/slapos into cloudooo

software/cloudooo/development.cfg

-[buildout]
-extends = software.cfg
-auto-checkout = cloudooo

software/cloudooo/software.cfg

@@ -4,7 +4,14 @@ extends =
 
 versions = versions
 
+# Local development
+develop =
+  ${:parts-directory}/slapos.cookbook-repository
 parts +=
+# Local development
+  slapos.cookbook-repository
+  check-recipe
+  slapos.cookbook-python2.6
 # Create instance template
   template
 
@@ -13,11 +20,26 @@ parts +=
 # development / fast switching environment for whole software
 unzip = true
 
-[instance-recipe]
-# Note: In case if specific instantiation recipe is used this is the place to
-# put its name
-egg = slapos.cookbook
-module = cloudooo
+# Local development
+[slapos.cookbook-repository]
+recipe = plone.recipe.command
+stop-on-error = true
+location = ${buildout:parts-directory}/${:_buildout_section_name_}
+command = ${git:location}/bin/git clone --branch cloudooo --quiet http://git.erp5.org/repos/slapos.git ${:location}
+update-command = cd ${:location} && ${git:location}/bin/git pull --quiet
+
+[check-recipe]
+recipe = plone.recipe.command
+stop-on-error = true
+update-command = ${:command}
+command = grep parts ${buildout:develop-eggs-directory}/slapos.cookbook.egg-link
+
+[slapos.cookbook-python2.6]
+recipe = zc.recipe.egg
+eggs = slapos.cookbook
+scripts =
+python = python2.6
+ugly-depend-on = ${slapos.cookbook-repository:command} ${slapos.cookbook-repository:update-command}
 
 [template]
 # Default template for cloudooo instance.
@@ -44,7 +66,8 @@ mechanize = 0.2.5
 meld3 = 0.6.7
 psutil = 0.3.0
 rdiff-backup = 1.0.5
-slapos.cookbook = 0.38
+ # Unpined locally developed egg
+slapos.cookbook = 
 slapos.core = 0.21
 slapos.recipe.template = 2.2
 

stack/cloudooo.cfg

@@ -82,8 +82,6 @@ eggs =
   python-magic
   psutil
   WSGIUtils
-# instantiation egg
-  ${instance-recipe:egg}
 entry-points =
   cloudooo_tester=cloudooo.bin.cloudooo_tester:main
   runCloudoooUnitTest=cloudooo.tests.runHandlerUnitTest:run