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

This reverts commit 4d4518ed52.
pull/4189/merge
Michael DeHaan 11 years ago
parent 084dc38fbe
commit 99d6726114

@ -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':

Loading…
Cancel
Save