Skip to content
Snippets Groups Projects
Commit b0e45311 authored by Alexander Schlemmer's avatar Alexander Schlemmer
Browse files

Merge commit

parent 3a5a4bf4
No related branches found
No related tags found
1 merge request!160STY: styling
Pipeline #47893 passed
Stage: info
Stage: setup
Stage: cert
Stage: style
Stage: test
Show whitespace changes
Inline Side-by-side
.gitignore
+ 2
− 0
View file @ b0e45311
...@@ -18,3 +18,5 @@ start_caosdb_docker.sh ...@@ -18,3 +18,5 @@ start_caosdb_docker.sh
src/doc/_apidoc src/doc/_apidoc
/dist/ /dist/
*.egg-info *.egg-info
venv/
.backups
\ No newline at end of file
src/caoscrawler/crawl.py
+ 1
− 0
View file @ b0e45311
...@@ -184,6 +184,7 @@ def _treat_merge_error_of(newrecord, record): ...@@ -184,6 +184,7 @@ def _treat_merge_error_of(newrecord, record):
""" """
for this_p in newrecord.properties: for this_p in newrecord.properties:
that_p = record.get_property(this_p.name) that_p = record.get_property(this_p.name)
if that_p is None: if that_p is None:
logger.debug(f"Property {this_p.name} does not exist in the second entity. Note that " logger.debug(f"Property {this_p.name} does not exist in the second entity. Note that "
"this should not be the reason for the merge conflict.") "this should not be the reason for the merge conflict.")
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment