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

Revert "fix conversion from file to hardlink when force=yes"

Browse Source 
This reverts commit 4d4518ed52.
reviewable/pr18780/r1
Michael DeHaan 11 years ago
parent c44aceb986
commit 772bd33a0f
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File

2
files/file
Unescape Escape View File

@ -231,7 +231,7 @@ def main():
module.exit_json(path=path, changed=True) module.exit_json(path=path, changed=True)
if prev_state != 'absent' and prev_state != state: if prev_state != 'absent' and prev_state != state:
if not (force and (prev_state == 'file' or prev_state == 'directory') and (state in ('link', 'hard')) and state != 'touch': if not (force and (prev_state == 'file' or prev_state == 'directory') and state == 'link') and state != 'touch':
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, src))
if prev_state == 'absent' and state == 'absent': if prev_state == 'absent' and state == 'absent':

Write Preview
Loading…
Cancel
Save