Merge branch 'improved-broken-vcard-handling' of github.com:pbiering/Radicale into improved-broken-vcard-handling

This commit is contained in:
Peter Bieringer 2016-09-18 19:28:15 +02:00
commit e05206eec3

View File

@ -742,7 +742,14 @@ class Collection(BaseCollection):
break break
return collection.serialize() return collection.serialize()
elif self.get_meta("tag") == "VADDRESSBOOK": elif self.get_meta("tag") == "VADDRESSBOOK":
return "".join([item.serialize() for item in items]) items_ok = []
for item in items:
try:
item.serialize()
items_ok.append(item)
except:
self.logger.exception("VCARD broken (skip): %s", item)
return "".join([item.serialize() for item in items_ok])
return "" return ""
_lock = threading.Lock() _lock = threading.Lock()