archive
/
ansible
mirror of https://github.com/ansible/ansible.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'patch-1' of https://github.com/telsacolton/ansible into telsacolton-patch-1

Browse Source
pull/7419/head
James Cammarata 11 years ago
parent df877f2e79 06963c7826
commit 32ce085689
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File

4
library/files/file
Unescape Escape View File

@ -201,12 +201,12 @@ def main():
module.fail_json(msg="absolute paths are required") module.fail_json(msg="absolute paths are required")
elif prev_state == 'directory': elif prev_state == 'directory':
if not force: if not force:
module.fail_json(path=path, msg='refusing to convert between %s and %s for %s' % (prev_state, state, src)) module.fail_json(path=path, msg='refusing to convert between %s and %s for %s' % (prev_state, state, path))
elif len(os.listdir(path)) > 0: elif len(os.listdir(path)) > 0:
# refuse to replace a directory that has files in it # refuse to replace a directory that has files in it
module.fail_json(path=path, msg='the directory %s is not empty, refusing to convert it' % path) module.fail_json(path=path, msg='the directory %s is not empty, refusing to convert it' % path)
elif prev_state in ['file', 'hard'] and not force: elif prev_state in ['file', 'hard'] and not force:
module.fail_json(path=path, msg='refusing to convert between %s and %s for %s' % (prev_state, state, src)) module.fail_json(path=path, msg='refusing to convert between %s and %s for %s' % (prev_state, state, path))
if prev_state == 'absent': if prev_state == 'absent':
changed = True changed = True

Write Preview
Loading…
Cancel
Save