error when having custom timeperiods defined in WATO
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: 79e8618d5b608276191c2cab9fc22213d926710a
URL:
http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=79e8618d5b6082…
Author: Lars Michelsen <lm(a)mathias-kettner.de>
Date: Fri May 25 16:47:28 2012 +0200
FIX: Fixed "make_utf is not defined" error when having custom timeperiods
defined in WATO
---
ChangeLog | 8 ++++++++
modules/check_mk.py | 2 +-
2 files changed, 9 insertions(+), 1 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index ede25ed..8b937f4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,11 @@
+1.2.0b6
+ Multisite:
+ * FIX: Fixed layout of some dropdown fields in view filters
+
+ Core:
+ * FIX: Fixed "make_utf is not defined" error when having custom
+ timeperiods defined in WATO
+
1.2.0b5:
Core:
* FIX: handle UTF-8 encoded binary strings correctly (e.g. in host alias)
diff --git a/modules/check_mk.py b/modules/check_mk.py
index 7f33d18..7fd3af7 100755
--- a/modules/check_mk.py
+++ b/modules/check_mk.py
@@ -2011,7 +2011,7 @@ def create_nagios_config_timeperiods(outfile):
tp = timeperiods[name]
outfile.write("define timeperiod {\n timeperiod_name\t\t%s\n" %
name)
if "alias" in tp:
- outfile.write(" alias\t\t\t\t%s\n" %
make_utf(tp["alias"]))
+ outfile.write(" alias\t\t\t\t%s\n" %
make_utf8(tp["alias"]))
for key, value in tp.items():
if key not in [ "alias", "exclude" ]:
times = ",".join([ ("%s-%s" % (fr, to)) for (fr,
to) in value ])