[jhbuild] do not hardcode Python modules installation path (#575426)
- From: Frederic Peters <fpeters src gnome org>
- To: svn-commits-list gnome org
- Subject: [jhbuild] do not hardcode Python modules installation path (#575426)
- Date: Wed, 22 Apr 2009 06:44:34 -0400 (EDT)
commit b8e05a311c3b8b1cedb3a0686cff07bd3998327c
Author: Frederic Peters <fpeters 0d be>
Date: Wed Apr 22 12:43:15 2009 +0200
do not hardcode Python modules installation path (#575426)
In Python 2.6, site-packages got replaced by dist-packages, so
we get the actual value by asking distutils.
---
jhbuild/config.py | 17 ++++++++++++++---
1 files changed, 14 insertions(+), 3 deletions(-)
diff --git a/jhbuild/config.py b/jhbuild/config.py
index a49adcb..45f5e9a 100644
--- a/jhbuild/config.py
+++ b/jhbuild/config.py
@@ -252,14 +252,25 @@ class Config:
get_stderr = False).strip()
except CommandError:
pythonversion = 'python' + str(sys.version_info[0]) + '.' + str(sys.version_info[1])
-
+
+ # In Python 2.6, site-packages got replaced by dist-packages, get the
+ # actual value by asking distutils
+ # <http://bugzilla.gnome.org/show_bug.cgi?id=575426>
+ try:
+ python_packages_dir = get_output([python_bin, 'c',
+ 'import os, distutils.sysconfig; '\
+ 'print distutils.sysconfig.get_python_lib(prefix="").split(os.path.sep)[-1]'],
+ get_stderr=False).strip()
+ except CommandError:
+ python_packages_dir = 'site-packages'
+
if self.use_lib64:
- pythonpath = os.path.join(self.prefix, 'lib64', pythonversion, 'site-packages')
+ pythonpath = os.path.join(self.prefix, 'lib64', pythonversion, python_packages_dir)
addpath('PYTHONPATH', pythonpath)
if not os.path.exists(pythonpath):
os.makedirs(pythonpath)
- pythonpath = os.path.join(self.prefix, 'lib', pythonversion, 'site-packages')
+ pythonpath = os.path.join(self.prefix, 'lib', pythonversion, python_packages_dir)
addpath('PYTHONPATH', pythonpath)
if not os.path.exists(pythonpath):
os.makedirs(pythonpath)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]