Additional changes to fix fileglob relative path lookups

2015-07-27 16:35:27 -04:00 · 2015-07-27 16:35:27 -04:00 · d6cafff2f9
parent 9416fc6271
commit d6cafff2f9
1 changed files with 3 additions and 2 deletions
--- a/lib/ansible/plugins/lookup/fileglob.py
+++ b/lib/ansible/plugins/lookup/fileglob.py
@ -30,7 +30,8 @@ class LookupModule(LookupBase):

        ret = []
        for term in terms:
-            dwimmed = self._loader.path_dwim_relative(basedir, 'files', term)
-            globbed = glob.glob(dwimmed)
+            term_file = os.path.basename(term)
+            dwimmed_path = self._loader.path_dwim_relative(basedir, '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))
        return ret