From ca8e0bd92ada6253a86fff4184107fec44139005 Mon Sep 17 00:00:00 2001 From: Nicolas Girard Date: Mon, 18 May 2020 18:48:46 +0200 Subject: [PATCH] Honor config.ignore_symlinks when walking the directory trees --- CHANGELOG.md | 6 +++++- Cargo.toml | 2 +- src/main.rs | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d99fc8..94043b9 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,7 +4,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/en/1.0.0/). This project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0.html). -## [Unreleased] +## [0.6.1] - 2020-05-18 + +### Fixed + +- Honor config.ignore_symlinks when walking the directory trees (thanks to [BartMassey](https://github.com/BartMassey)) ## [0.6.0] – 2020-05-16 diff --git a/Cargo.toml b/Cargo.toml index 69bc2ee..dea1e5a 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "lolcate-rs" -version = "0.6.0" +version = "0.6.1" description = "A comically fast way of indexing and querying your filesystem. Replaces locate / mlocate / updatedb." documentation = "https://github.com/ngirard/lolcate-rs/blob/master/README.md" readme = "README.md" diff --git a/src/main.rs b/src/main.rs index cee9be6..4751de8 100644 --- a/src/main.rs +++ b/src/main.rs @@ -290,7 +290,7 @@ pub fn walker(config: &config::Config, database: &str) -> ignore::Walk { let mut wd = ignore::WalkBuilder::new(&paths[0]); wd.hidden(config.ignore_hidden) // Whether to ignore hidden files .parents(false) // Don't read ignore files from parent directories - .follow_links(true) // Follow symbolic links + .follow_links(!config.ignore_symlinks) // Follow symbolic links .ignore(true) // Don't read .ignore files .git_global(config.gitignore) // Don't read global gitignore file .git_ignore(config.gitignore) // Don't read .gitignore files