External-Mirrors/awx
2
0
Fork 0
mirror of https://github.com/ansible/awx.git synced 2026-03-19 01:47:31 -02:30
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #6773 from ryanpetrello/playbook-scan-symlinks

Browse Source 
follow symlinks while discovering valid playbooks

Reviewed-by: https://github.com/apps/softwarefactory-project-zuul
This commit is contained in:
softwarefactory-project-zuul[bot]
2020-04-22 18:35:53 +00:00
committed by GitHub
parent 9cfecb5590 3dd21d720e
commit 28c3fa517e
2 changed files with 2 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
awx/main/models/projects.py
View File

@@ -199,7 +199,7 @@ class ProjectOptions(models.Model):
results = [] results = []
project_path = self.get_project_path() project_path = self.get_project_path()
if project_path: if project_path:
for dirpath, dirnames, filenames in os.walk(smart_str(project_path)): for dirpath, dirnames, filenames in os.walk(smart_str(project_path), followlinks=True):
if skip_directory(dirpath): if skip_directory(dirpath):
continue continue
for filename in filenames: for filename in filenames:

1
awx/main/utils/ansible.py
View File

@@ -64,6 +64,7 @@ def could_be_playbook(project_path, dir_path, filename):
matched = True matched = True
break break
except IOError: except IOError:
logger.exception(f'failed to open {playbook_path}')
return None return None
if not matched: if not matched:
return None return None