mirrors/rustic
2
0
Fork 0
mirror of https://github.com/rustic-rs/rustic.git synced 2025-10-26 11:18:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #494 from rustic-rs/merge-nodelete

Browse Source 
merge: respect delete-never and delete-after options
This commit is contained in:
aawsome 2023-03-16 07:46:01 +01:00 committed by GitHub
commit f005d0eaae
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/commands/merge_cmd.rs
View File

@ -101,9 +101,14 @@ pub(super) fn execute(
info!("saved new snapshot as {new_id}.");
if opts.delete {
let now = Local::now();
let p = progress_counter("deleting old snapshots...");
let snap_ids = snapshots.iter().map(|sn| &sn.id);
be.delete_list(FileType::Snapshot, true, snap_ids, p)?;
let snap_ids: Vec<_> = snapshots
.iter()
.filter(|sn| !sn.must_keep(now))
.map(|sn| &sn.id)
.collect();
be.delete_list(FileType::Snapshot, true, snap_ids.into_iter(), p)?;
}
Ok(())