Merge pull request #4632 from simonsd/devel

refusing to convert between file and hard when force=yes
11 years ago · 41ed5635dc
parent d0904ded84 4d4518ed52
commit 41ed5635dc
1 changed files with 1 additions and 1 deletions
--- a/library/files/file
+++ b/library/files/file
@ -231,7 +231,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' or prev_state == 'directory') and state == 'link') and state != 'touch':
+        if not (force and (prev_state == 'file' or prev_state == 'directory') and (state in ('link', 'hard')) 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':