New upstream version 0.13~~git20190527.g039c4a1

1 files changed, 9 insertions, 1 deletions

diff --git a/lib/backupstore/BackupStoreCheck.cpp b/lib/backupstore/BackupStoreCheck.cpp
index b53ebf6d..37e45b03 100644
--- a/lib/backupstore/BackupStoreCheck.cpp
+++ b/lib/backupstore/BackupStoreCheck.cpp
@@ -174,9 +174,17 @@ void BackupStoreCheck::Check()
 
 	try
 	{
+		// We should be able to load a reference to the old refcount database
+		// (read-only) at the same time that we have a reference to the new one
+		// (temporary) open but not yet committed.
 		std::auto_ptr<BackupStoreRefCountDatabase> apOldRefs =
 			BackupStoreRefCountDatabase::Load(account, false);
-		mNumberErrorsFound += mapNewRefs->ReportChangesTo(*apOldRefs);
+
+		// If we have created a new lost+found directory (and thus allocated it a nonzero
+		// object ID) then it's not surprising that the previous refcount DB did not have
+		// a reference to this directory, and not an error, so ignore it.
+		mNumberErrorsFound += mapNewRefs->ReportChangesTo(*apOldRefs,
+			mLostAndFoundDirectoryID); // ignore_object_id
 	}
 	catch(BoxException &e)
 	{