From 53be991cfef51f910bcdd4d94bebc37bf6bce659 Mon Sep 17 00:00:00 2001 From: Ryan Petrello Date: Wed, 20 May 2020 16:30:44 -0400 Subject: [PATCH] Revert "follow symlinks while discovering valid playbooks" This reverts commit 3dd21d720eb5351e63f9f31c4e601a67965dac56. --- awx/main/models/projects.py | 2 +- awx/main/utils/ansible.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/awx/main/models/projects.py b/awx/main/models/projects.py index 38ca20ab06..0207fec97b 100644 --- a/awx/main/models/projects.py +++ b/awx/main/models/projects.py @@ -199,7 +199,7 @@ class ProjectOptions(models.Model): results = [] project_path = self.get_project_path() if project_path: - for dirpath, dirnames, filenames in os.walk(smart_str(project_path), followlinks=True): + for dirpath, dirnames, filenames in os.walk(smart_str(project_path)): if skip_directory(dirpath): continue for filename in filenames: diff --git a/awx/main/utils/ansible.py b/awx/main/utils/ansible.py index eda6d6d214..18011504b9 100644 --- a/awx/main/utils/ansible.py +++ b/awx/main/utils/ansible.py @@ -64,7 +64,6 @@ def could_be_playbook(project_path, dir_path, filename): matched = True break except IOError: - logger.exception(f'failed to open {playbook_path}') return None if not matched: return None