diff --git a/.gitignore b/.gitignore index 182ed05e1404483ecb553c8a4e469a86a77ba27c..7ad8606171fd21b94ffd8b15b972f956d4dfc1a1 100644 --- a/.gitignore +++ b/.gitignore @@ -18,3 +18,5 @@ start_caosdb_docker.sh src/doc/_apidoc /dist/ *.egg-info +venv/ +.backups \ No newline at end of file diff --git a/src/caoscrawler/crawl.py b/src/caoscrawler/crawl.py index e532f20e339de243ae4565a12724261452a0eda6..0d28ad5f2924978677a4af48664d5cf1ccfca069 100644 --- a/src/caoscrawler/crawl.py +++ b/src/caoscrawler/crawl.py @@ -184,6 +184,7 @@ def _treat_merge_error_of(newrecord, record): """ for this_p in newrecord.properties: that_p = record.get_property(this_p.name) + if that_p is None: 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.")