[checkmk-commits] Fixed import error that broke the current nightly builds

Module: check_mk Branch: master Commit: 54ae595b0c3fd39142ecb554ad8e358e077587e3 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=54ae595b0c3fd3… Author: Lars Michelsen <lm(a)mathias-kettner.de> Date: Fri Mar 10 09:08:30 2017 +0100 Fixed import error that broke the current nightly builds Change-Id: Ic21efce3cf984ef83e8df8d2664ba4dcc3134725 --- web/htdocs/wato.py | 5 ++++- web/plugins/wato/check_mk_configuration.py | 2 -- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/web/htdocs/wato.py b/web/htdocs/wato.py index 760d268..c833978 100644 --- a/web/htdocs/wato.py +++ b/web/htdocs/wato.py @@ -102,7 +102,10 @@ from cmk.regex import escape_regex_chars, regex from cmk.defines import short_service_state_name import cmk.render as render - +if cmk.is_managed_edition(): + import managed +else: + managed = None try: import simplejson as json diff --git a/web/plugins/wato/check_mk_configuration.py b/web/plugins/wato/check_mk_configuration.py index 8e8f421..3091258 100644 --- a/web/plugins/wato/check_mk_configuration.py +++ b/web/plugins/wato/check_mk_configuration.py @@ -29,8 +29,6 @@ import re import cmk import cmk.paths -import managed - # .--Global Settings-----------------------------------------------------. # | ____ _ _ _ ____ _ _ _ | # | / ___| | ___ | |__ __ _| | / ___| ___| |_| |_(_)_ __ __ _ ___ |