From f15239070576e43033f892a8d392d3b62f8f8c66 Mon Sep 17 00:00:00 2001
From: Vincent Pelletier <vincent@nexedi.com>
Date: Thu, 29 Jul 2010 13:19:27 +0000
Subject: [PATCH] bin/buildout must also be invoked with "python -S".

Note: this is an imperfect workaround for broken site packages.
A broken python install would not be avoided by this.

A better fix would be to include a python build in buildout bootstrap
process, so rest of processing becomes independent from site's python
installation.


git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37367 20353a03-c40f-0410-a6d1-a30d3c3de9de
---
 buildout/README-2.12.txt | 8 ++++----
 buildout/README.txt      | 6 +++---
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/buildout/README-2.12.txt b/buildout/README-2.12.txt
index a067fbd9ff..493c4f9810 100644
--- a/buildout/README-2.12.txt
+++ b/buildout/README-2.12.txt
@@ -38,7 +38,7 @@ Run the Zope 2.12 buildout:
 
   $ cd ~/erp5.buildout
   $ python2.6 -S bootstrap/bootstrap.py -v 1.4.3
-  $ bin/buildout -v -c buildout-2.12.cfg
+  $ python2.6 -S bin/buildout -v -c buildout-2.12.cfg
 
 This will download and install the software components needed to run ERP5 on
 Zope 2.12 including Zope 2.12 plus dependencies (including
@@ -54,7 +54,7 @@ Each software component in this buildout might require some system
 dependencies, including development libraries and executables.
 To query what is required for all components, please run:
 
-  $ bin/buildout install show-requirements
+  $ python2.6 -S bin/buildout install show-requirements
 
 Minimal requirements
 --------------------
@@ -120,7 +120,7 @@ parts =
   supervisor-instance
 ^D
 $ ~/erp5.buildout/bin/bootstrap2.6      # 4
-$ bin/buildout -ov                      # 5
+$ python2.6 -S bin/buildout -ov         # 5
 
 Notice how we managed to run buildout in "offline-mode" (-o). The software-home
 configuration (along with the 'extends-cache' in the 'instance-profiles'
@@ -142,7 +142,7 @@ $ $EDITOR buildout.cfg                  # 7
 
 Then run buildout again to finish the configuration
 
-$ bin/buildout -ov                      # 8
+$ python2.6 -S bin/buildout -ov         # 8
 
 Now a fully configured development instance will be available in the directory
 "var/development-instance", so you can do:
diff --git a/buildout/README.txt b/buildout/README.txt
index 4f114e96bc..5b9dc20020 100644
--- a/buildout/README.txt
+++ b/buildout/README.txt
@@ -108,11 +108,11 @@ parts =
 software_home = /home/MYUSER/erp5.buildout
 ^D
 $ ~/erp5.buildout/bin/python2.4 bootstrap/bootstrap.py -c my_instances.cfg
-$ bin/buildout -c my_instances.cfg
+$ python -S bin/buildout -c my_instances.cfg
 $ var/bin/supervisord # it will start supervisor and configured software
 $ $EDITOR my_instances.cfg
 # add "runUnitTest" and "development-site" to parts
-$ bin/buildout -c my_instances.cfg
+$ python -S bin/buildout -c my_instances.cfg
 
 Fully configured development instance will be available in var/development-site.
 
@@ -129,7 +129,7 @@ $ cd software
 $ echo '[buildout]' >> buildout.cfg
 $ echo 'extends = https://svn.erp5.org/repos/public/erp5/trunk/buildout/buildout.cfg' >> buildout.cfg
 $ wget -qO - http://svn.zope.org/*checkout*/zc.buildout/trunk/bootstrap/bootstrap.py | python -S -
-$ bin/buildout
+$ python -S bin/buildout
 
 Note on -S: this switch is overridden by PYTHON_PATH environment variable. In
 doubt, unset it before invoking that command.
-- 
2.30.9