From 63da9f83979aa9fd940ad43d71c0e44d343c09b5 Mon Sep 17 00:00:00 2001 From: Christian Ebner Date: Tue, 26 Nov 2024 17:14:52 +0100 Subject: [PATCH] client: backup writer: fix regression in progress output Fixes a regression introduced when switching from the plain string to be used for archive names to the BackupArchiveName api type in commit addfae26 ("api types: introduce `BackupArchiveName` type"). The archive name now always is stored including the server archive name extension. Adapt the check for which archive types to display the progress log output to reflect this change. Fixes: addfae26 ("api types: introduce `BackupArchiveName` type") Reported-by: Max Carrara Signed-off-by: Christian Ebner --- pbs-client/src/backup_writer.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs index baf2aebb..f321ea40 100644 --- a/pbs-client/src/backup_writer.rs +++ b/pbs-client/src/backup_writer.rs @@ -847,9 +847,9 @@ impl BackupWriter { let (upload_queue, upload_result) = Self::append_chunk_queue(h2.clone(), wid, append_chunk_path, uploaded_len.clone()); - let progress_handle = if archive.ends_with(".img") - || archive.ends_with(".pxar") - || archive.ends_with(".ppxar") + let progress_handle = if archive.ends_with(".img.fidx") + || archive.ends_with(".pxar.didx") + || archive.ends_with(".ppxar.didx") { let counters = counters.clone(); Some(tokio::spawn(async move {