From: Wouter Wijngaards Date: Wed, 10 Aug 2011 07:37:57 +0000 (+0000) Subject: updated patch from Tom. X-Git-Tag: release-1.4.13rc1~12 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=63c07d13ce09c83c6ef4143ace393fe6c0cbca8f;p=thirdparty%2Funbound.git updated patch from Tom. git-svn-id: file:///svn/unbound/trunk@2472 be551aaa-1e26-0410-a405-d3ace91eadb9 --- diff --git a/doc/Changelog b/doc/Changelog index ffb5465ec..95f74125a 100644 --- a/doc/Changelog +++ b/doc/Changelog @@ -1,5 +1,6 @@ 10 August 2011: Wouter - Fix python site-packages path to /usr/lib64. + - updated patch from Tom. 9 August 2011: Wouter - patch from Tom Hendrikx fixes load of python modules. diff --git a/pythonmod/pythonmod.c b/pythonmod/pythonmod.c index a0d1cf768..759f1fff4 100644 --- a/pythonmod/pythonmod.c +++ b/pythonmod/pythonmod.c @@ -153,8 +153,8 @@ int pythonmod_init(struct module_env* env, int id) } PyRun_SimpleString("sys.path.append('"RUN_DIR"') \n"); PyRun_SimpleString("sys.path.append('"SHARE_DIR"') \n"); - PyRun_SimpleString("import sysconfig \n"); - PyRun_SimpleString("sys.path.append(sysconfig.get_path('purelib')) \n"); + PyRun_SimpleString("import distutils.sysconfig \n"); + PyRun_SimpleString("sys.path.append(distutils.sysconfig.get_python_lib(1,0)) \n"); if (PyRun_SimpleString("from unboundmodule import *\n") < 0) { log_err("pythonmod: cannot initialize core module: unboundmodule.py");