From b705dc10c1b15a9cf3fa2b1648274f4d70ee1aa2 Mon Sep 17 00:00:00 2001 From: Ahilya Sinha Date: Fri, 23 Mar 2018 18:39:14 +0530 Subject: [PATCH] Fixed lint checking directories it shouldn't be (#10147) Lint earlier checked _venv/ and .git/ which it shouldn't be checking. --- tools/gitignore/gitignore.py | 2 +- tools/lint/lint.py | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/tools/gitignore/gitignore.py b/tools/gitignore/gitignore.py index 8433eda553ff7e..0be6f8f4c9cdd7 100644 --- a/tools/gitignore/gitignore.py +++ b/tools/gitignore/gitignore.py @@ -90,7 +90,7 @@ def parse_line(line): if dir_only: line = line[:-1] - return invert, dir_only, fnmatch_translate(line, "/" in line) + return invert, dir_only, fnmatch_translate(line, dir_only) class PathFilter(object): diff --git a/tools/lint/lint.py b/tools/lint/lint.py index 7eb3d4ac7ecbb8..8c53d2132f5393 100644 --- a/tools/lint/lint.py +++ b/tools/lint/lint.py @@ -60,7 +60,7 @@ def setup_logging(prefix=False): %s: %s""" def all_filesystem_paths(repo_root, subdir=None): - path_filter = PathFilter(repo_root, extras=[".git/*"]) + path_filter = PathFilter(repo_root, extras=[".git/"]) if subdir: expanded_path = subdir else: @@ -72,8 +72,7 @@ def all_filesystem_paths(repo_root, subdir=None): yield path dirnames[:] = [item for item in dirnames if path_filter(os.path.relpath(os.path.join(dirpath, item) + "/", - repo_root))] - + repo_root)+"/")] def _all_files_equal(paths): """