diff --git a/src/cleaners.rs b/src/cleaners.rs index f6c8f08..925937e 100644 --- a/src/cleaners.rs +++ b/src/cleaners.rs @@ -82,14 +82,14 @@ impl Runner { async fn paths_producer(tasks: &mut JoinSet>) -> mpsc::Receiver { let (input_tx, input_rx) = mpsc::channel(CHANNEL_SIZE); - let walker = WalkDir::new(".").follow_links(false); + let walker = WalkDir::new(".").follow_links(false).same_file_system(true); tasks.spawn(async move { for entry in walker { match entry { Ok(e) if !Self::is_dir(&e) => { input_tx .send(Decision { - path: e.into_path(), + path: e.into_path().strip_prefix(".")?.to_path_buf(), action: Action::Undecided, }) .await?; diff --git a/src/cleaners/dso.rs b/src/cleaners/dso.rs index 965a513..7aea0fe 100644 --- a/src/cleaners/dso.rs +++ b/src/cleaners/dso.rs @@ -77,7 +77,6 @@ impl Cleaner for DsoCleaner { if decision.action == Action::Keep { let ino = nix::sys::stat::lstat(&decision.path)?.st_ino; inodes_to_keep.insert(ino); - dbg!(&decision.path, ino); } // If something was marked as "keep" or "remove" before, @@ -111,10 +110,6 @@ impl Cleaner for DsoCleaner { }; for path in paths { - if path.display().to_string().contains("libjsonrpccpp-server") { - dbg!(inode, &path, action); - } - output.send(Decision { path, action }).await?; } }