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

Properly clean up dnagling unmanaged entries in the state file.

Browse source
This commit is contained in:
R-VdP 2023-03-14 17:14:39 +01:00
parent 5b91600523
commit 5f72cae0bd
No known key found for this signature in database
1 changed files with 11 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

16
src/activate/etc_files/etc_tree.rs
View file

@ -90,6 +90,9 @@ impl EtcTree {
maybe_subtree.unwrap_or_else(|| { maybe_subtree.unwrap_or_else(|| {
EtcTree::with_status( EtcTree::with_status(
new_path.to_owned(), new_path.to_owned(),
// We only label as managed the final path entry,
// to label intermediate nodes as managed, we should
// call this function for every one of them separately.
components components
.peek() .peek()
.map_or(EtcFileStatus::Managed, |_| { .map_or(EtcFileStatus::Managed, |_| {
@ -133,6 +136,10 @@ impl EtcTree {
new_tree new_tree
}); });
// We clean up nodes that are empty and unmanaged.
// These represent intermediate directories that already existed, so we
// are not responsible for cleaning them up (we don't run the delete_action
// closure on their paths).
if new_tree.nested.is_empty() { if new_tree.nested.is_empty() {
if let EtcFileStatus::Managed = new_tree.status { if let EtcFileStatus::Managed = new_tree.status {
if delete_action(&new_tree.path) { if delete_action(&new_tree.path) {
@ -189,11 +196,10 @@ impl EtcTree {
new_tree new_tree
}); });
if merged.nested.is_empty() { // If our invariants are properly maintained, then we should never end up
if let EtcFileStatus::Unmanaged = merged.status { // here with dangling unmanaged nodes.
return None; debug_assert!(!merged.nested.is_empty() || merged.status == EtcFileStatus::Managed);
}
}
Some(merged) Some(merged)
} }
} }