matthiasbeyer/imag
1
0
Fork 0
Code Releases Activity

Fix: Do only check entries which are a ref

Browse source 
We should not try to check entries that are not refs because this will
always fail. And because we fail _hard_, the execution of the command
fails on the first non-ref-entry and exits the program. Not good for a
filter... :-)

Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
This commit is contained in:
Matthias Beyer 2019-04-27 01:57:40 +02:00
parent 485779a176
commit a7f2826bb9
1 changed files with 16 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

31
bin/core/imag-ref/src/main.rs
View file

@ -175,23 +175,24 @@ fn list_dead(rt: &Runtime) {
.for_each(|id| { .for_each(|id| {
match rt.store().get(id.clone()).map_err_trace_exit_unwrap() { match rt.store().get(id.clone()).map_err_trace_exit_unwrap() {
Some(entry) => { Some(entry) => {
let entry_path = entry let entry_ref = entry.as_ref_with_hasher::<DefaultHasher>();
.as_ref_with_hasher::<DefaultHasher>()
.get_path(&cfg)
.map_err_trace_exit_unwrap();
if !entry_path.exists() { if entry_ref.is_ref().map_err_trace_exit_unwrap() { // we only care if the entry is a ref
if list_id { let entry_path = entry_ref.get_path(&cfg).map_err_trace_exit_unwrap();
writeln!(output, "{}", entry.get_location().local().display())
} else if list_path { if !entry_path.exists() {
writeln!(output, "{}", entry_path.display()) if list_id {
} else { writeln!(output, "{}", entry.get_location().local().display())
unimplemented!() } else if list_path {
writeln!(output, "{}", entry_path.display())
} else {
unimplemented!()
}
.map_err(Error::from)
.map_err_trace_exit_unwrap();
let _ = rt.report_touched(entry.get_location()).unwrap_or_exit();
} }
.map_err(Error::from)
.map_err_trace_exit_unwrap();
let _ = rt.report_touched(entry.get_location()).unwrap_or_exit();
} }
} }