Merge remote branch 'origin/devel' into devel

lib/ansible/runner/lookup_plugins/first_found.py

@@ -83,6 +83,23 @@
 #  - files: foo.${inventory_hostname}
 #    skip: true
 
+# example a role with default configuration and configuration per host
+# you can set multiple terms with their own files and paths to look through.
+# consider a role that sets some configuration per host falling back on a default config.
+#
+#- name: some configuration template
+#  template: src={{ item }} dest=/etc/file.cfg mode=0444 owner=root group=root
+#  with_first_found:
+#   - files:
+#      - ${inventory_hostname}/etc/file.cfg
+#     paths:
+#      - ../../../templates.overwrites
+#      - ../../../templates
+#   - files:
+#      - etc/file.cfg
+#     paths:
+#      - templates
+
 # the above will return an empty list if the files cannot be found at all
 # if skip is unspecificed or if it is set to false then it will return a list 
 # error which can be caught bye ignore_errors: true for that action.
@@ -101,8 +118,6 @@
 #    ignore_errors: true
 
 
-
-
 from ansible import utils, errors
 import os
 
@@ -123,6 +138,7 @@ class LookupModule(object):
             if isinstance(term, dict):
                 anydict = True
 
+        total_search = []
         if anydict:
             for term in terms:
                 if isinstance(term, dict):
@@ -144,9 +160,6 @@ class LookupModule(object):
                             paths = paths.replace(';', ' ')
                             pathlist = paths.split(' ')
 
-                    total_search = []
-                
-
                     if not pathlist:
                         total_search = filelist
                     else:
@@ -155,7 +168,7 @@ class LookupModule(object):
                                 f = os.path.join(path, fn)
                                 total_search.append(f)
                 else:
-                    total_search = [term]
+                    total_search.append(term)
         else:
             total_search = terms