Revert "Distinguish a failed key source from one with no entry"

This reverts commit 22a3e3fd01.
This commit is contained in:
Matthew Jackson
2026-07-29 19:15:21 -07:00
parent 50f37462db
commit 4ed245868e
3 changed files with 9 additions and 25 deletions
+3 -13
View File
@@ -350,25 +350,15 @@ pub fn resolve_and_apply_traced(
outcome: KeyOutcome::NoKey,
});
}
// No key from this source either way, but WHY differs and the caller
// renders it: a source that errored is a fixable condition (server
// unreachable, keydb unreadable), while "no entry for this disc" is
// not. Recording both as NoEntry lost that distinction — the same one
// drive_unit_keys / drive_fmts_indexes were refactored to preserve.
Ok(_) => {
// Empty (no key here) or a source failure — both are "no key from
// this source"; move on to the next.
Ok(_) | Err(_) => {
trace.keys.push(KeyStep {
who,
path: vec![KeyNode::NoEntry],
outcome: KeyOutcome::NoKey,
});
}
Err(_) => {
trace.keys.push(KeyStep {
who,
path: vec![KeyNode::SourceFailed],
outcome: KeyOutcome::NoKey,
});
}
}
}
(false, trace)