From e3de6da87e34f3d82e60d2093d7edc8317cbe64b Mon Sep 17 00:00:00 2001
From: shortcutme <hello@noloop.me>
Date: Fri, 9 Sep 2016 12:24:00 +0200
Subject: [PATCH] Ignore deleted files on contetndb iteritems

---
 src/Content/ContentDbDict.py | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Content/ContentDbDict.py b/src/Content/ContentDbDict.py
index 131271f5..78eeb452 100644
--- a/src/Content/ContentDbDict.py
+++ b/src/Content/ContentDbDict.py
@@ -70,9 +70,12 @@ class ContentDbDict(dict):
         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 @@ class ContentDbDict(dict):
                 try:
                     val = self.loadItem(key)
                 except Exception:
+                    self.log.error("Error loading %s: %s" % (key, err))
                     continue
             back.append((key, val))
         return back