summaryrefslogtreecommitdiff
path: root/files
diff options
context:
space:
mode:
authorJames Cammarata <jimi@sngx.net>2014-09-22 15:40:06 -0500
committerJames Cammarata <jimi@sngx.net>2014-09-22 15:40:06 -0500
commitbb8bac490a1b4f1ac4b8e6c718057ad11726be62 (patch)
tree93bc636aa26c31b29ca3a24d04f895a3724d7606 /files
parent0d0576a97fe19411250df262c9aaa6c86b99f3ec (diff)
parent583cfa45e51b53915e35b3fed1471bcf91edc13c (diff)
downloadansible-modules-extras-bb8bac490a1b4f1ac4b8e6c718057ad11726be62.tar.gz
Merge branch 'devel' of https://github.com/dmage/ansible into dmage-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 e25278fd..9d6374ee 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':