wbrawner/ansible
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Apply regex to dir name only (#35744)

Browse source
This commit is contained in:
Chris Houseknecht 2018-02-06 16:39:57 -05:00 committed by GitHub
parent 1d068d4af9
commit c20beeef37
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
lib/ansible/cli/galaxy.py
View file

@ -233,7 +233,7 @@ class GalaxyCLI(CLI):
for root, dirs, files in os.walk(role_skeleton, topdown=True): for root, dirs, files in os.walk(role_skeleton, topdown=True):
rel_root = os.path.relpath(root, role_skeleton) rel_root = os.path.relpath(root, role_skeleton)
in_templates_dir = rel_root.split(os.sep, 1)[0] == 'templates' in_templates_dir = rel_root.split(os.sep, 1)[0] == 'templates'
dirs[:] = [d for d in dirs if not any(r.match(os.path.join(rel_root, d)) for r in skeleton_ignore_re)] dirs[:] = [d for d in dirs if not any(r.match(d) for r in skeleton_ignore_re)]
for f in files: for f in files:
filename, ext = os.path.splitext(f) filename, ext = os.path.splitext(f)