Fixed broken force=yes on files for directories

pull/4468/head
Andrew Pope 11 years ago
parent a017a69bb3
commit 6342046da6

@ -226,7 +226,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' and state == 'link') 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