diff options
author | jctanner <tanner.jc@gmail.com> | 2016-08-11 19:55:21 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-08-11 19:55:21 -0400 |
commit | 39d764c7adef870847755941f8308b6bd854def6 (patch) | |
tree | 6e2080ab927f8de19d579546e42bab087afe46b6 | |
parent | 901042f4587957bb2da10a21db2ef8fb3f0813b3 (diff) | |
download | ansible-39d764c7adef870847755941f8308b6bd854def6.tar.gz |
Restore previous behavior of ignoring missing files via with_fileglob (#17053)
Fixes #16801
-rw-r--r-- | lib/ansible/plugins/lookup/fileglob.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/lib/ansible/plugins/lookup/fileglob.py b/lib/ansible/plugins/lookup/fileglob.py index 2f4ece02da..8315e0dbc0 100644 --- a/lib/ansible/plugins/lookup/fileglob.py +++ b/lib/ansible/plugins/lookup/fileglob.py @@ -21,6 +21,7 @@ import os import glob from ansible.plugins.lookup import LookupBase +from ansible.errors import AnsibleFileNotFound class LookupModule(LookupBase): @@ -29,7 +30,11 @@ class LookupModule(LookupBase): ret = [] for term in terms: term_file = os.path.basename(term) - dwimmed_path = self.find_file_in_search_path(variables, 'files', os.path.dirname(term)) - globbed = glob.glob(os.path.join(dwimmed_path, term_file)) - ret.extend(g for g in globbed if os.path.isfile(g)) + try: + dwimmed_path = self.find_file_in_search_path(variables, 'files', os.path.dirname(term)) + except AnsibleFileNotFound: + dwimmed_path = None + if dwimmed_path: + globbed = glob.glob(os.path.join(dwimmed_path, term_file)) + ret.extend(g for g in globbed if os.path.isfile(g)) return ret |