From a76386e5282dbd639f04e93cdbeef035f323c692 Mon Sep 17 00:00:00 2001 From: link2xt Date: Sun, 14 Aug 2022 20:26:07 +0000 Subject: [PATCH] imex: make it possible to cancel backup export Previously shall_stop_ongoing() was never used in backup export, so cancelling backup export did not actually stop the process. --- src/imex.rs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/imex.rs b/src/imex.rs index e7ec2582f..eb84d7e63 100644 --- a/src/imex.rs +++ b/src/imex.rs @@ -614,6 +614,11 @@ async fn export_backup_inner( ); continue; } + + if context.shall_stop_ongoing().await { + bail!("Backup export cancelled"); + } + let mut file = File::open(entry.path()).await?; let path_in_archive = PathBuf::from(BLOBS_BACKUP_NAME).join(name); builder.append_file(path_in_archive, &mut file).await?;