From 46e2f56736d5a98ee483ab2c64df2a2a1a3f254a Mon Sep 17 00:00:00 2001
From: Julien Muchembled <jm@nexedi.com>
Date: Wed, 30 Jan 2013 11:37:46 +0100
Subject: [PATCH] Make cloudooo use Python 2.7

---
 component/cloudooo/buildout.cfg |  2 +-
 software/cloudooo/software.cfg  | 15 ---------------
 stack/cloudooo.cfg              |  5 -----
 3 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/component/cloudooo/buildout.cfg b/component/cloudooo/buildout.cfg
index a3c17d71c..75da6dce6 100755
--- a/component/cloudooo/buildout.cfg
+++ b/component/cloudooo/buildout.cfg
@@ -26,7 +26,7 @@ update-command = cd ${:location} && ${git:location}/bin/git pull --quiet && if [
 
 [cloudooo]
 recipe = zc.recipe.egg
-python = python2.6
+python = python2.7
 extra-paths = ${cloudooo-repository:location}
 eggs =
   ${lxml-python:egg}
diff --git a/software/cloudooo/software.cfg b/software/cloudooo/software.cfg
index 1cd51b33d..ffee9c611 100755
--- a/software/cloudooo/software.cfg
+++ b/software/cloudooo/software.cfg
@@ -14,8 +14,6 @@ parts +=
 # Local development
   slapos.cookbook-repository
   check-recipe
-  slapos.cookbook-python2.6
-  slapos.recipe.template-python2.6
 # Create instance template
   template
 
@@ -38,19 +36,6 @@ 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}
-
-[slapos.recipe.template-python2.6]
-recipe = zc.recipe.egg
-eggs = slapos.recipe.template
-scripts =
-python = python2.6
-
 [template-jinja2-base]
 recipe = slapos.recipe.template:jinja2
 template = ${:_profile_base_location_}/${:filename}.in
diff --git a/stack/cloudooo.cfg b/stack/cloudooo.cfg
index 445a8b6ae..1443dc7d7 100755
--- a/stack/cloudooo.cfg
+++ b/stack/cloudooo.cfg
@@ -36,7 +36,6 @@ extends =
   ../component/libreoffice-bin/buildout.cfg 
   ../component/libpng/buildout.cfg
   ../component/lxml-python/buildout.cfg
-  ../component/python-2.6/buildout.cfg
   ../component/python-2.7/buildout.cfg
   ../component/xorg/buildout.cfg
   ../component/fonts/buildout.cfg
@@ -79,7 +78,6 @@ parts =
   pdftk
   ffmpeg
 
-  bootstrap2.6
   rdiff-backup
   cloudooo
 
@@ -87,9 +85,6 @@ parts =
 develop +=
   ${:parts-directory}/cloudooo
 
-[bootstrap2.6]
-python = python2.6
-
 [versions]
 # Use SlapOS patched zc.buildout
 zc.buildout = 1.6.0-dev-SlapOS-006
-- 
2.30.9