Skip broken props in get_multi

pimutils · Dec 7, 2014 · 6f8c670 · 6f8c670
1 parent be14457
commit 6f8c670
Showing 1 changed file with 12 additions and 8 deletions.
diff --git a/vdirsyncer/storage/dav.py b/vdirsyncer/storage/dav.py
@@ -325,14 +325,18 @@ def get_multi(self, hrefs):
         for element in root.iter('{DAV:}response'):
             href = self._normalize_href(
                 element.find('{DAV:}href').text)
-            raw = element \
-                .find('{DAV:}propstat') \
-                .find('{DAV:}prop') \
-                .find(self.get_multi_data_query).text
-            etag = element \
-                .find('{DAV:}propstat') \
-                .find('{DAV:}prop') \
-                .find('{DAV:}getetag').text
+
+            try:
+                prop = element.find('{DAV:}propstat').find('{DAV:}prop')
+                raw = prop.find(self.get_multi_data_query).text
+                etag = prop.find('{DAV:}getetag').text
+                if not raw or not etag:
+                    raise AttributeError()
+            except AttributeError:
+                dav_logger.warning('Skipping {}, properties are missing.'
+                                   .format(href))
+                continue
+
             if isinstance(raw, bytes):
                 raw = raw.decode(response.encoding)
             if isinstance(etag, bytes):