Ignore deleted files on contetndb iteritems

diesiren · Sep 9, 2016 · e3de6da · e3de6da
1 parent 7d78623
commit e3de6da
Showing 1 changed file with 7 additions and 3 deletions.
diff --git a/src/Content/ContentDbDict.py b/src/Content/ContentDbDict.py
@@ -70,9 +70,12 @@ def __delitem__(self, key):
         self.db.deleteContent(self.site_address, key)
 
     def iteritems(self):
-        for key, val in dict.iteritems(self):
-            if not val:
-                val = self.loadItem(key)
+        for key in dict.keys(self):
+            try:
+                val = self[key]
+            except Exception, err:
+                self.log.error("Error loading %s: %s" % (key, err))
+                continue
             yield key, val
 
     def items(self):
@@ -83,6 +86,7 @@ def items(self):
                 try:
                     val = self.loadItem(key)
                 except Exception:
+                    self.log.error("Error loading %s: %s" % (key, err))
                     continue
             back.append((key, val))
         return back