[checkmk-commits] Check_MK Git: check_mk: FIX: Fixed exception during initial page rendering in python 2. 6 in special cases

Module: check_mk Branch: master Commit: d05837b2496e6fb1d442d1651e9c6bd91463653f URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=d05837b2496e6f… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Mon Apr 29 09:43:14 2013 +0200 FIX: Fixed exception during initial page rendering in python 2.6 in special cases (Internal error: putenv() argument 2 must be string, not list) Conflicts: ChangeLog --- ChangeLog | 3 +++ web/htdocs/htmllib.py | 3 ++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index f2d531c..0f298a7 100644 --- a/ChangeLog +++ b/ChangeLog @@ -115,6 +115,9 @@ a deletion of users' settings in case of an external authentication (like mod_ldap). * FIX: Fixed handling of dashboards without title in sidebar view snapin + * FIX: titles and services got lost when moving join-columns in views + * FIX: Fixed exception during initial page rendering in python 2.6 in special cases + (Internal error: putenv() argument 2 must be string, not list) WATO: * Improved handling of valuespec validations in WATO rule editor. Displaying a diff --git a/web/htdocs/htmllib.py b/web/htdocs/htmllib.py index 4e79c67..bfae476 100644 --- a/web/htdocs/htmllib.py +++ b/web/htdocs/htmllib.py @@ -1194,7 +1194,8 @@ document.body.onfocus = keybindings_focus; def omd_mode(self): # Load mod_python env into regular environment - os.environ.update(self.req.subprocess_env) + for k, v in self.req.subprocess_env.items(): + os.environ[k] = v omd_mode = None omd_site = None