Merge branch 'dmage-devel' into devel

reviewable/pr18780/r1
James Cammarata 10 years ago
commit dea00c767b

@ -257,8 +257,8 @@ def main():
else: else:
relpath = os.path.dirname(path) relpath = os.path.dirname(path)
absrc = os.path.normpath('%s/%s' % (relpath, os.path.basename(src))) absrc = os.path.join(relpath, src)
if not os.path.exists(src) and not os.path.exists(absrc) and not force: 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) 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': if state == 'hard':

Loading…
Cancel
Save