[Erp5-report] r41004 lucas - /erp5/trunk/buildout/profiles/

[nobody at svn.erp5.org]

Author: lucas
Date: Wed Dec  1 22:32:20 2010
New Revision: 41004

URL: http://svn.erp5.org?rev=41004&view=rev
Log:
Applied same changes done by Luke on r40977 for Zope 2.8

Modified:
    erp5/trunk/buildout/profiles/deployment.cfg
    erp5/trunk/buildout/profiles/official.cfg
    erp5/trunk/buildout/profiles/versions-2.12.cfg
    erp5/trunk/buildout/profiles/versions-common.cfg
    erp5/trunk/buildout/profiles/versions.cfg

Modified: erp5/trunk/buildout/profiles/deployment.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/deployment.cfg?rev=41004&r1=41003&r2=41004&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/deployment.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/deployment.cfg [utf8] Wed Dec  1 22:32:20 2010
@@ -26,7 +26,6 @@ parts =
   supervisor-instance
   memcached-instance
 
-python = software_definition
 versions = versions
 
 [configuration]

Modified: erp5/trunk/buildout/profiles/official.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/official.cfg?rev=41004&r1=41003&r2=41004&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/official.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/official.cfg [utf8] Wed Dec  1 22:32:20 2010
@@ -38,9 +38,6 @@ extends =
   ../profiles/common.cfg
   ../profiles/software-common.cfg
 
-rebootstrap-section = python2.4
-
-python = python2.4
 versions = versions
 
 parts =
@@ -76,6 +73,7 @@ parts =
   oood
   precache-eggs
   pythonbin2.4
+  bootstrap2.4
   instance_template
 
 # fonts
@@ -95,3 +93,13 @@ mysql_software = ${mysql-tritonn-5.0:loc
 # instance setups as standard executable because all eggs are available only
 # by this script and not into the binary.
 executable = ${:software_home}/bin/python2.4
+
+[bootstrap2.4]
+# as bootstrap in python software does not know that slapos.rebootstrap >= 2.0
+# is used it is required to go back to default -- use own version of python
+python = buildout
+
+[rebootstrap]
+# This is first version of python
+version = 1
+section = python2.4

Modified: erp5/trunk/buildout/profiles/versions-2.12.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions-2.12.cfg?rev=41004&r1=41003&r2=41004&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions-2.12.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions-2.12.cfg [utf8] Wed Dec  1 22:32:20 2010
@@ -16,6 +16,3 @@ Products.Zelenium >= 1.0.3
 # official pysvn egg does not supports --include-dirs and
 # --library-dirs, so we use our modified version
 pysvn = 1.7.4nxd004
-
-# Use new version of slapos.rebootstrap
-slapos.rebootstrap >= 2.0

Modified: erp5/trunk/buildout/profiles/versions-common.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions-common.cfg?rev=41004&r1=41003&r2=41004&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions-common.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions-common.cfg [utf8] Wed Dec  1 22:32:20 2010
@@ -29,3 +29,6 @@ xml-marshaller >= 0.9.2
 distribute =
 zc.buildout =
 setuptools =
+
+# Use new version of slapos.rebootstrap
+slapos.rebootstrap >= 2.0

Modified: erp5/trunk/buildout/profiles/versions.cfg
URL: http://svn.erp5.org/erp5/trunk/buildout/profiles/versions.cfg?rev=41004&r1=41003&r2=41004&view=diff
==============================================================================
--- erp5/trunk/buildout/profiles/versions.cfg [utf8] (original)
+++ erp5/trunk/buildout/profiles/versions.cfg [utf8] Wed Dec  1 22:32:20 2010
@@ -13,6 +13,3 @@ lxml = 2.2.8
 #pysvn = 1.7.2
 # zc.recipe.egg is pinned as this is known compatible versions with
 zc.recipe.egg = 1.2.2
-
-# use well known version of slapos.rebootstrap, 1.0
-slapos.rebootstrap = 1.0