s0me1newithhand7s/system-manager
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Pass the correct closure to the update_state call.

Browse source
This commit is contained in:
R-VdP 2023-03-16 11:59:44 +01:00
parent 687c533478
commit f569c59eee
No known key found for this signature in database
1 changed files with 7 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

10
src/activate/etc_files.rs
View file

@ -87,7 +87,13 @@ pub fn activate(store_path: &StorePath, ephemeral: bool) -> Result<()> {
let new_state = create_etc_links(config.entries.values(), &etc_dir, state, &old_state) let new_state = create_etc_links(config.entries.values(), &etc_dir, state, &old_state)
.update_state(old_state, &|path, status| { .update_state(old_state, &|path, status| {
log::debug!("Deactivating: {}", path.display()); log::debug!("Deactivating: {}", path.display());
false try_delete_path(path, status)
.map_err(|e| {
log::error!("Error deleting path: {}", path.display());
log::error!("{e}");
e
})
.is_ok()
}); });
serialise_state(new_state)?; serialise_state(new_state)?;
@ -193,8 +199,6 @@ fn create_etc_link(link_target: &OsStr, etc_dir: &Path, state: EtcTree) -> (EtcT
} }
} }
// TODO split up this function, and treat symlinks and copied files the same in the state file (ie
// include the root for both).
fn create_etc_entry( fn create_etc_entry(
entry: &EtcFile, entry: &EtcFile,
etc_dir: &Path, etc_dir: &Path,