Merge pull request #6134 from veeti/include_with_items_path

Show the offending file name with the include + with_items error

Merge pull request #6134 from veeti/include_with_items_path
Show the offending file name with the include + with_items error
b8f1e4f7 · Michael DeHaan · 4a06954a · dd6f2e6b · b8f1e4f7
Commit b8f1e4f7 authored Mar 16, 2014 by Michael DeHaan
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 1 deletions

lib/ansible/playbook/play.py
+5 -1

No files found.
--- a/lib/ansible/playbook/play.py
+++ b/lib/ansible/playbook/play.py
@@ -517,7 +517,11 @@ class Play(object):
                include_vars = {}
                for k in x:
                    if k.startswith("with_"):
-                        utils.deprecated("include + with_items is a removed deprecated feature", "1.5", removed=True)
+                        if original_file:
+                            offender = " (in %s)" % original_file
+                        else:
+                            offender = ""
+                        utils.deprecated("include + with_items is a removed deprecated feature" + offender, "1.5", removed=True)
                    elif k.startswith("when_"):
                        utils.deprecated("\"when_<criteria>:\" is a removed deprecated feature, use the simplified 'when:' conditional directly", None, removed=True)
                    elif k == 'when':