Merge pull request #5264 from drewlll2ll/file-fix

file module: Fixed missing prev_state == 'directory' in file
2014-01-06 14:07:07 -08:00 · 2014-01-06 14:07:07 -08:00 · 87b58666f9
commit 87b58666f9
parent 600f7bcdf0 8fe3b05262
1 changed files with 4 additions and 0 deletions
--- a/files/file
+++ b/files/file
@ -307,6 +307,10 @@ def main():
            if not force:
                module.fail_json(dest=path, src=src, msg='Cannot link, file exists at destination')
            changed = True
+        elif prev_state == 'directory':
+            if not force:
+                module.fail_json(dest=path, src=src, msg='Cannot link, directory exists at destination')
+            changed = True
        else:
            module.fail_json(dest=path, src=src, msg='unexpected position reached')