Skip to content
Snippets Groups Projects
Commit 7a5a4651 authored by Henrik tom Wörden's avatar Henrik tom Wörden
Browse files

FIX: use correct logger and not root logger

parent 0aa029d0
No related branches found
No related tags found
1 merge request!96Release 0.11.2
Pipeline #34605 passed
......@@ -43,6 +43,8 @@ from caosdb.common.models import (Container, Entity, File, Property, Query,
get_config, SPECIAL_ATTRIBUTES)
from caosdb.exceptions import CaosDBException
logger = logging.getLogger(__name__)
class EntityMergeConflictError(CaosDBException):
"""An error that is raised in case of an unresolvable conflict when merging
......@@ -413,7 +415,7 @@ def merge_entities(entity_a: Entity, entity_b: Entity, merge_references_with_emp
"""
logging.warning(
logger.warning(
"This function is currently experimental and insufficiently tested. Use with care.")
# Compare both entities:
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment