src/backup/datastore.rs: remove_backup_(group/dir) - return Error instead of io::Error

This commit is contained in:
Dietmar Maurer 2020-01-23 10:14:46 +01:00
parent c425bdc9b2
commit 6abce6c2bb
1 changed files with 4 additions and 4 deletions

View File

@ -185,12 +185,12 @@ impl DataStore {
} }
/// Remove a complete backup group including all snapshots /// Remove a complete backup group including all snapshots
pub fn remove_backup_group(&self, backup_group: &BackupGroup) -> Result<(), io::Error> { pub fn remove_backup_group(&self, backup_group: &BackupGroup) -> Result<(), Error> {
let full_path = self.group_path(backup_group); let full_path = self.group_path(backup_group);
log::info!("removing backup group {:?}", full_path); log::info!("removing backup group {:?}", full_path);
std::fs::remove_dir_all(full_path)?; std::fs::remove_dir_all(&full_path)
.map_err(|err| { .map_err(|err| {
format_err!( format_err!(
"removing backup group {:?} failed - {}", "removing backup group {:?} failed - {}",
@ -203,12 +203,12 @@ impl DataStore {
} }
/// Remove a backup directory including all content /// Remove a backup directory including all content
pub fn remove_backup_dir(&self, backup_dir: &BackupDir) -> Result<(), io::Error> { pub fn remove_backup_dir(&self, backup_dir: &BackupDir) -> Result<(), Error> {
let full_path = self.snapshot_path(backup_dir); let full_path = self.snapshot_path(backup_dir);
log::info!("removing backup snapshot {:?}", full_path); log::info!("removing backup snapshot {:?}", full_path);
std::fs::remove_dir_all(full_path) std::fs::remove_dir_all(&full_path)
.map_err(|err| { .map_err(|err| {
format_err!( format_err!(
"removing backup snapshot {:?} failed - {}", "removing backup snapshot {:?} failed - {}",