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

[nap]

The following commit has been merged in the debian/master branch:
commit d4fc121fdf5819249051844efb6fd49b9ed551df
Author: nap <naparuba at gmail.com>
Date:   Thu Nov 24 21:08:30 2011 +0100

    Fix : deleting void macros even if there were none.

diff --git a/shinken/macroresolver.py b/shinken/macroresolver.py
index efffb69..a2f6404 100644
--- a/shinken/macroresolver.py
+++ b/shinken/macroresolver.py
@@ -111,7 +111,8 @@ class MacroResolver(Borg):
                 macros[elt] = {'val' : '', 'type' : 'unknown'}
 
         #self.cache[s] = macros
-        del(macros[''])
+        if '' in macros:
+            del macros['']
         return macros
 
 

-- 
UNNAMED PROJECT