diff options
author | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-07-20 00:09:19 +0000 |
---|---|---|
committer | Daniel Joseph Barnhart Clark <dclark@pobox.com> | 2007-07-20 00:09:19 +0000 |
commit | 27afe92d3622cf424203ca56e915f5ef55125294 (patch) | |
tree | 47a9df89d51579b4996a2f3426363beedef53388 /encap/src/encap-profiles/bcfg2-0.9.4i.ep | |
parent | 6e1286016d9e4aca87415ddb4266e26db1d32af9 (diff) | |
download | bcfg2-27afe92d3622cf424203ca56e915f5ef55125294.tar.gz bcfg2-27afe92d3622cf424203ca56e915f5ef55125294.tar.bz2 bcfg2-27afe92d3622cf424203ca56e915f5ef55125294.zip |
EncapPackages: How's this for fun: If you have 2 seperate python binaries at different locations, both named "python", then somehow they both pick up the same python shared libraries, but if you call the second one using a different name, you get the shared library it's supposed to be using. This hit me when I installed a non-bcfg2 python in /usr/local, and suddenly bcfg2 stopped working with:
Traceback (most recent call last):
File "/usr/local/bin/bcfg2", line 14, in ?
import Bcfg2.Options
ImportError: No module named Bcfg2.Options
Because it was using the python that thought modules were under /usr/local/lib instead of /usr/local/lib/bcfg2/lib
This patch should fix it.
git-svn-id: https://svn.mcs.anl.gov/repos/bcfg/trunk/bcfg2@3511 ce84e21b-d406-0410-9b95-82705330c041
Diffstat (limited to 'encap/src/encap-profiles/bcfg2-0.9.4i.ep')
-rw-r--r-- | encap/src/encap-profiles/bcfg2-0.9.4i.ep | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/encap/src/encap-profiles/bcfg2-0.9.4i.ep b/encap/src/encap-profiles/bcfg2-0.9.4i.ep index f682e38e1..2bbfa49bb 100644 --- a/encap/src/encap-profiles/bcfg2-0.9.4i.ep +++ b/encap/src/encap-profiles/bcfg2-0.9.4i.ep @@ -111,7 +111,7 @@ Index: bcfg2/src/lib/Client/XML.py <configure type="unset" /> <build> -/usr/local/lib/bcfg2/bin/python setup.py build \ +/usr/local/bin/b2-python setup.py build \ --build-base=${builddir}/build </build> @@ -123,12 +123,12 @@ test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 || mkdir ${ENCAP_SOURCE}/${EN test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4 test -d ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages || mkdir ${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages -PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/lib/bcfg2/bin/python setup.py install \ +PYTHONPATH="${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2/lib/python2.4/site-packages" /usr/local/bin/b2-python setup.py install \ --prefix=${ENCAP_SOURCE}/${ENCAP_PKGNAME}/lib/bcfg2 </install> <clean> -/usr/local/lib/bcfg2/bin/python setup.py clean +/usr/local/bin/b2-python setup.py clean </clean> </source> @@ -186,7 +186,7 @@ touch var/encap/${ENCAP_PKGNAME} ]]></prepackage> <include_file name="b2-regexplace.py" mode="0755"><![CDATA[ -#!/usr/local/lib/bcfg2/bin/python +#!/usr/local/bin/b2-python # regexplace: regular expression search and replace # Stefano Spinucci @@ -314,7 +314,7 @@ if __name__ == '__main__': BASEDIR="`echo ${0} | xargs -n1 dirname`" REGEXPLACE="${BASEDIR}/b2-regexplace.py" -PYTHON="/usr/local/lib/bcfg2/bin/python" +PYTHON="/usr/local/bin/b2-python" BINARIES="${REGEXPLACE} ${PYTHON}" COMPILEALL="/usr/local/lib/bcfg2/lib/python2.4/compileall.py" @@ -364,15 +364,15 @@ printf "\nReplacing \"xmllint\" with \"/usr/local/bin/b2-xmllint\"...\n" ${REGEXPLACE} ${BASEDIR} .\* xmllint \/usr\/local\/bin\/b2-xmllint printf "\nReplacing \"#!/usr/bin/env python\" with " -printf "\"#!/usr/local/lib/bcfg2/bin/python\"...\n" -${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/env\ python \#\!\/usr\/local\/lib\/bcfg2\/bin\/python +printf "\"#!/usr/local/bin/b2-python\"...\n" +${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/env\ python \#\!\/usr\/local\/bin\/b2-python printf "\nReplacing \"#!/usr/bin/perl\" with \"#!/usr/bin/env perl\"...\n" ${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/perl \#\!\/usr\/bin\/env\ perl printf "\nReplacing \"#!/usr/bin/python\" with " -printf "\"#!/usr/local/lib/bcfg2/bin/python\"...\n" -${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/python \#\!\/usr\/local\/lib\/bcfg2\/bin\/python +printf "\"#!/usr/local/bin/b2-python\"...\n" +${REGEXPLACE} ${BASEDIR} .\* \#\!\/usr\/bin\/python \#\!\/usr\/local\/bin\/b2-python # For some reason this causes TLSSocketServerMixIn.py to be replaced with the contents of # TLSSocketServerMixIn.pyc , which breaks things. Should figure out why and fix this for |