summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-09-22 15:42:38 -0500
committerJames Cammarata <jimi@sngx.net>2014-09-22 15:42:38 -0500
commitdea00c767bba8828bc347d9f8cf67a335cb0ce8f (patch)
tree6f3f0a09d818dee7a7ad386b67098aa1b187fbc1 /files
parent8b81062be0b47006c2717b96a25d8ae8a6bb1cbe (diff)
parentbb8bac490a1b4f1ac4b8e6c718057ad11726be62 (diff)
downloadansible-modules-extras-dea00c767bba8828bc347d9f8cf67a335cb0ce8f.tar.gz
Merge branch 'dmage-devel' into devel
Diffstat (limited to 'files')
-rw-r--r--files/file4
1 files changed, 2 insertions, 2 deletions
diff --git a/files/file b/files/file
index 2f26a3bc..ff9feb41 100644
--- a/files/file
+++ b/files/file
@@ -257,8 +257,8 @@ def main():
else:
relpath = os.path.dirname(path)
- absrc = os.path.normpath('%s/%s' % (relpath, os.path.basename(src)))
- if not os.path.exists(src) and not os.path.exists(absrc) and not force:
+ absrc = os.path.join(relpath, src)
+ if not os.path.exists(absrc) and not force:
module.fail_json(path=path, src=src, msg='src file does not exist, use "force=yes" if you really want to create the link: %s' % absrc)
if state == 'hard':