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

[Gerhard Lausser]

The following commit has been merged in the debian/master branch:
commit 5746f17174ec141fe115e290f672aed08131ab2a
Author: Gerhard Lausser <gerhard.lausser at consol.de>
Date:   Wed Jan 25 14:43:37 2012 +0100

    *Fix disco datas again without iteritems()

diff --git a/shinken/objects/discoveryrule.py b/shinken/objects/discoveryrule.py
index abe8ff4..3ebf7bd 100644
--- a/shinken/objects/discoveryrule.py
+++ b/shinken/objects/discoveryrule.py
@@ -165,7 +165,7 @@ class Discoveryrule(Item):
         for m in self.matches:
             #print "Compare to", m
             match_one = False
-            for (k, v) in datas.iteritems():
+            for (k, v) in datas:
                 # We found at least one of our match key
                 if m == k:
                     if self.is_matching(k, v):
@@ -183,7 +183,7 @@ class Discoveryrule(Item):
         for m in self.not_matches:
             #print "Compare to NOT", m
             match_one = False
-            for (k, v) in datas.iteritems():
+            for (k, v) in datas:
                 #print "K,V", k,v
                 # We found at least one of our match key
                 if m == k:

-- 
UNNAMED PROJECT