From 9bcda7d6cfb7148660997fe151da8a418744d38e Mon Sep 17 00:00:00 2001 From: Carl Johnsen Date: Thu, 28 Nov 2024 09:22:09 +0100 Subject: [PATCH] Symlinks are now handled correctly --- Duplicati/Library/Main/Operation/Restore/FileLister.cs | 2 +- Duplicati/Library/Main/Operation/Restore/FileProcessor.cs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Duplicati/Library/Main/Operation/Restore/FileLister.cs b/Duplicati/Library/Main/Operation/Restore/FileLister.cs index cc740a8a2..da8805584 100644 --- a/Duplicati/Library/Main/Operation/Restore/FileLister.cs +++ b/Duplicati/Library/Main/Operation/Restore/FileLister.cs @@ -46,7 +46,7 @@ namespace Duplicati.Library.Main.Operation.Restore { try { - var files = db.GetFilesToRestore(true).OrderByDescending(x => x.Length).ToArray(); + var files = db.GetFilesToRestore2(true).OrderByDescending(x => x.Length).ToArray(); result.OperationProgressUpdater.UpdatePhase(OperationPhase.Restore_DownloadingRemoteFiles); diff --git a/Duplicati/Library/Main/Operation/Restore/FileProcessor.cs b/Duplicati/Library/Main/Operation/Restore/FileProcessor.cs index a1eca696f..6d6f6875c 100644 --- a/Duplicati/Library/Main/Operation/Restore/FileProcessor.cs +++ b/Duplicati/Library/Main/Operation/Restore/FileProcessor.cs @@ -93,7 +93,7 @@ namespace Duplicati.Library.Main.Operation.Restore missing_blocks = new_missing_blocks; } - if (missing_blocks.Count == 0 || (missing_blocks.Count == 1 && missing_blocks[0].BlockSize == 0)) + if (file.BlocksetID != LocalDatabase.SYMLINK_BLOCKSET_ID && (missing_blocks.Count == 0 || (missing_blocks.Count == 1 && missing_blocks[0].BlockSize == 0))) { if (options.Dryrun) {