[checkmk-commits] Check_MK Git: check_mk: ldap.py: fixed invalide site.

getsitepackages call for python 2.6 Message-ID: <50d0a2d7.fX0D2Fi2LEM7ptnl%ab(a)mathias-kettner.de> User-Agent: Heirloom mailx 12.4 7/29/08 MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Transfer-Encoding: 7bit Module: check_mk Branch: master Commit: 8db2b2bd005213df46000797df838298cbaf5f5e URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=8db2b2bd005213… Author: Andreas Boesl <ab(a)mathias-kettner.de> Date: Tue Dec 18 18:07:29 2012 +0100 ldap.py: fixed invalide site.getsitepackages call for python 2.6 --- ChangeLog | 2 ++ web/plugins/userdb/ldap.py | 10 +++++++++- 2 files changed, 11 insertions(+), 1 deletions(-) diff --git a/ChangeLog b/ChangeLog index cd1e07d..3a01224 100644 --- a/ChangeLog +++ b/ChangeLog @@ -35,6 +35,8 @@ * FIX: apache_status: fixed bug with missing 'url', wrote man page * Add: flexible notifcations: filter by hostname * FIX: fixed missing localisation in check_parameteres.py + * FIX: userdb/ldap.py: fixed invalid call site.getsitepackages() for python 2.6 + Multisite: * Implemented LDAP integration of Multisite. You can now authenticate your diff --git a/web/plugins/userdb/ldap.py b/web/plugins/userdb/ldap.py index 44d8b6b..7aa41fb 100644 --- a/web/plugins/userdb/ldap.py +++ b/web/plugins/userdb/ldap.py @@ -33,8 +33,16 @@ import time, copy # There seem to be some initialization problems with mod_pythan as the sys.path # is correct when excuting python from the command line as site user. # Try to workaround the problem now... + import site, sys -sys.path.extend(site.getsitepackages()) +try: + sys.path.extend(site.getsitepackages()) +except: # Workaround, python 2.6 ( debian squeeze ) + sys.path.extend(["/usr/local/lib/python2.6/dist-packages"]) + sys.path.extend(["/usr/lib/python2.6/dist-packages"]) + pass + + try: # docs: http://www.python-ldap.org/doc/html/index.html