Merge pull request #8329 from rdolejsi/devel

file: prevent replace failure when overwriting empty directory with hard or soft link on force=yes

library/files/file

@@ -233,6 +233,8 @@ def main():
                 # try to replace atomically
                 tmppath = '/'.join([os.path.dirname(path), ".%s.%s.tmp" % (os.getpid(),time.time())])
                 try:
+                    if prev_state == 'directory' and (state == 'hard' or state == 'link'):
+                        os.rmdir(path)
                     if state == 'hard':
                         os.link(src,tmppath)
                     else: