tobias/radicale
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cls.logger no longer exists

Browse Source
This commit is contained in:
Unrud 2018-09-09 14:58:43 +02:00
parent 95d8c273c4
commit ea7916e0fa
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
radicale/storage/multifilesystem/verify.py
View File

@ -60,9 +60,8 @@ class CollectionVerifyMixin:
has_child_collections = True has_child_collections = True
remaining_sane_paths.append(item.path) remaining_sane_paths.append(item.path)
elif item.uid in uids: elif item.uid in uids:
cls.logger.error( logger.error("Invalid item %r in %r: UID conflict %r",
"Invalid item %r in %r: UID conflict %r", item.href, sane_path, item.uid)
item.href, sane_path, item.uid)
else: else:
uids.add(item.uid) uids.add(item.uid)
logger.debug("Verified item %r in %r", logger.debug("Verified item %r in %r",
@ -70,7 +69,7 @@ class CollectionVerifyMixin:
if item_errors == saved_item_errors: if item_errors == saved_item_errors:
collection.sync() collection.sync()
if has_child_collections and collection.get_meta("tag"): if has_child_collections and collection.get_meta("tag"):
cls.logger.error("Invalid collection %r: %r must not have " logger.error("Invalid collection %r: %r must not have "
"child collections", sane_path, "child collections", sane_path,
collection.get_meta("tag")) collection.get_meta("tag"))
return item_errors == 0 and collection_errors == 0 return item_errors == 0 and collection_errors == 0