Merge pull request #4468 from drewlll2ll/devel

Fixed broken force=yes on files for directories
This commit is contained in:
Michael DeHaan 2013-10-11 17:33:25 -07:00
commit f51c19aaec

View file

@ -226,7 +226,7 @@ def main():
module.exit_json(path=path, changed=True)
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))
if prev_state == 'absent' and state == 'absent':