From bb8613cd6069e318d6aa05e3d05da2a9c0b013b7 Mon Sep 17 00:00:00 2001
From: Rafael Monnerat <rafael@nexedi.com>
Date: Mon, 29 Mar 2010 20:26:54 +0000
Subject: [PATCH] Partially reverted r34171 to use localbin again.

The bin/python2.4 must be able to run another buildout.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@34200 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/software-profiles/erp5.cfg       |  3 ---
 buildout/software-profiles/python-2.4.cfg | 16 +++++++++++++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/buildout/software-profiles/erp5.cfg b/buildout/software-profiles/erp5.cfg
index 7dc2515677..ae61f7fcc9 100644
--- a/buildout/software-profiles/erp5.cfg
+++ b/buildout/software-profiles/erp5.cfg
@@ -83,9 +83,6 @@ dependent-scripts = true
 interpreter = python${python2.4:version}
 extra-paths =
   ${zope-2.8:location}/lib/python
-scripts =
-  python=${:interpreter}
-  ipython=ipython${python2.4:version}
 
 [requirements]
 development =
diff --git a/buildout/software-profiles/python-2.4.cfg b/buildout/software-profiles/python-2.4.cfg
index fc7ce07911..987742f415 100644
--- a/buildout/software-profiles/python-2.4.cfg
+++ b/buildout/software-profiles/python-2.4.cfg
@@ -1,8 +1,9 @@
 [buildout]
+develop += local-eggs/localbin
 # extend your buildout with python-common.cfg before extending with this file
 
 parts =
-    python2.4
+    pythonbin2.4
 
 [python2.4-dbm-patch]
 recipe = hexagonit.recipe.download
@@ -19,3 +20,16 @@ name = python2.4
 # XXX maybe add the tarfile patch as well?
 patches =
 	${python2.4-dbm-patch:location}/${python2.4-dbm-patch:filename}
+
+[pythonbin2.4]
+# XXX/Note: This is hackish way to have fully featured python interpreter
+recipe = zc.recipe.egg:scripts
+eggs = ${eggs:eggs}
+  invokepython
+extra-paths =
+  ${zope-2.8:location}/lib/python
+dependent-scripts = true
+scripts =
+  invokepython=python${python2.4:python_version_major}
+  ipython=ipython${python2.4:python_version_major}
+
-- 
2.30.9