From 84fe91c29c24440980df4311d0ae0835337f1ec4 Mon Sep 17 00:00:00 2001 From: Hivert Quentin Date: Wed, 11 Sep 2024 17:56:45 +0200 Subject: [PATCH] fix(sogo-tool): prevent a bug when restoring two events with same id --- Tools/SOGoToolRestore.m | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Tools/SOGoToolRestore.m b/Tools/SOGoToolRestore.m index c2275bbf8..b0d7aed43 100644 --- a/Tools/SOGoToolRestore.m +++ b/Tools/SOGoToolRestore.m @@ -419,6 +419,7 @@ max = [records count]; for (count = 0; count < max; count++) { + version = 0; if (count > 0 && count%100 == 0) { DESTROY(pool); @@ -428,7 +429,7 @@ cName = [currentRecord objectForKey: @"c_name"]; if (![existingRecords objectForKey: cName]) { - NSLog (@"restoring record '%@'", cName); + NSLog (@"restoring record '%@' with version %d", cName, version); cContent = [currentRecord objectForKey: @"c_content"]; [gcsFolder writeContent: cContent fromComponent: [[self parsingClassForContent: cContent] parseSingleFromSource: cContent]