[checkmk-commits] 3224 FIX Fixed broken "WATO legacy eval"

Module: check_mk Branch: master Commit: cc89bc5b4469eaa516d3f4b1dd36b030d2782a10 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=cc89bc5b4469ea… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Tue Mar 8 17:28:29 2016 +0100 3224 FIX Fixed broken "WATO legacy eval" --- .werks/3224 | 10 ++++++++++ ChangeLog | 1 + web/htdocs/wato.py | 2 +- web/htdocs/watolib.py | 2 +- 4 files changed, 13 insertions(+), 2 deletions(-) diff --git a/.werks/3224 b/.werks/3224 new file mode 100644 index 0000000..809210a --- /dev/null +++ b/.werks/3224 @@ -0,0 +1,10 @@ +Title: Fixed broken "WATO legacy eval" +Level: 1 +Component: wato +Class: fix +Compatible: compat +State: unknown +Version: 1.2.9i1 +Date: 1455712509 + + diff --git a/ChangeLog b/ChangeLog index f317148..80e5052 100644 --- a/ChangeLog +++ b/ChangeLog @@ -99,6 +99,7 @@ * 3216 FIX: Fixed exception when trying to edit an already deleted user * 3222 FIX: Fixed broken duplicate user id validation when creating new users * 3223 FIX: Fixed exception in network scan when hosts can not be resolved + * 3224 FIX: Fixed broken "WATO legacy eval" * 3225 FIX: Fixed exception when renaming a host which is configured as parent on a folder * 3179 FIX: Fix labelling of heartbeat interval for liveproxyd settings... * 3180 FIX: Fix broken site specific globals and disabling of WATO in slave sites diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index c2faef6..5af65de 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -84,7 +84,7 @@ # `----------------------------------------------------------------------' import sys, pprint, socket, re, time, datetime, \ - shutil, tarfile, cStringIO, math, fcntl, pickle, random, glob, \ + shutil, tarfile, cStringIO, math, fcntl, random, glob, \ base64, csv import i18n import config, table, multitar, userdb, weblib, login diff --git a/web/htdocs/watolib.py b/web/htdocs/watolib.py index e437022..1c4a052 100644 --- a/web/htdocs/watolib.py +++ b/web/htdocs/watolib.py @@ -42,7 +42,7 @@ # | Doing this that must be done when the module WATO is loaded. | # '----------------------------------------------------------------------' -import os, shutil, subprocess, base64 +import os, shutil, subprocess, base64, pickle import defaults, config, hooks, userdb, multitar import sites from lib import *