Skip to content

Commit 5891088

Browse files
committed
fix for is_gpgkg_open results
1 parent 5e2eccc commit 5891088

File tree

1 file changed

+6
-3
lines changed

1 file changed

+6
-3
lines changed

mergin/merginproject.py

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -624,10 +624,13 @@ def get_local_delta(self, diff_directory: str) -> List[ProjectDeltaItem]:
624624
try:
625625
diff_location = self.fpath(diff_file, diff_directory)
626626
self.geodiff.create_changeset(origin_file, current_file, diff_location)
627-
if self.geodiff.has_changes(diff_location):
628-
delta_item.checksum = change.get("origin_checksum")
629-
delta_item.change = DeltaChangeType.UPDATE_DIFF
627+
if not self.geodiff.has_changes(diff_location):
630628
os.remove(diff_location)
629+
continue
630+
631+
delta_item.checksum = change.get("origin_checksum")
632+
delta_item.change = DeltaChangeType.UPDATE_DIFF
633+
os.remove(diff_location)
631634
except (pygeodiff.GeoDiffLibError, pygeodiff.GeoDiffLibConflictError) as e:
632635
self.log.warning("failed to create changeset for " + path)
633636
# probably the database schema has been modified if geodiff cannot create changeset.

0 commit comments

Comments
 (0)