[Pkg-nagios-changes] [SCM] UNNAMED PROJECT branch, debian/master, updated. 810edbdd3feedbfe37f4a65bee50b57b2f60fa2a

Gerhard Lausser gerhard.lausser at consol.de
Tue Feb 28 22:14:25 UTC 2012


The following commit has been merged in the debian/master branch:
commit 713f74bfb92e45d7cedb7cc96b36c13539a75218
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Sun Jan 15 19:43:29 2012 +0100

    Fix umlauts in german timezone

diff --git a/shinken/macroresolver.py b/shinken/macroresolver.py
index 45785de..361c17b 100644
--- a/shinken/macroresolver.py
+++ b/shinken/macroresolver.py
@@ -342,7 +342,7 @@ class MacroResolver(Borg):
 
     #Get Fri 15 May 11:42:39 CEST 2009
     def get_long_date_time(self):
-        return time.strftime("%a %d %b %H:%M:%S %Z %Y", time.localtime())
+        return time.strftime("%a %d %b %H:%M:%S %Z %Y", time.localtime()).decode('UTF-8', 'ignore')
 
 
     #Get 10-13-2000 00:30:28

-- 
UNNAMED PROJECT



More information about the Pkg-nagios-changes mailing list