Merge branch 'issue_3312_role_links' into devel

2013-09-16 09:29:25 -05:00 · 2013-09-16 09:29:25 -05:00 · 5b15010099
parent 02033f9ec8 d0236f6ada
commit 5b15010099
1 changed files with 5 additions and 1 deletions
--- a/lib/ansible/utils/init.py
+++ b/lib/ansible/utils/init.py
@ -254,6 +254,10 @@ def path_dwim_relative(original, dirname, source, playbook_base, check=True):
    # (used by roles code)

    basedir = os.path.dirname(original)
+    if os.path.islink(basedir):
+        basedir = unfrackpath(basedir)
+        template2 = os.path.join(basedir, dirname, source)
+    else:
        template2 = os.path.join(basedir, '..', dirname, source)
    source2 = path_dwim(basedir, template2)
    if os.path.exists(source2):