From b0e45311e4d512eea9d94ce282038b4f17c49012 Mon Sep 17 00:00:00 2001
From: Alexander Schlemmer <alexander@mail-schlemmer.de>
Date: Tue, 27 Feb 2024 16:06:21 +0100
Subject: [PATCH] Merge commit
---
.gitignore | 2 ++
src/caoscrawler/crawl.py | 1 +
2 files changed, 3 insertions(+)
diff --git a/.gitignore b/.gitignore
index 182ed05e..7ad86061 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 e532f20e..0d28ad5f 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.")
--
GitLab