file: prevent replace failure when overwriting empty directory with hard/link (force=yes)

2014-07-29 10:46:32 +02:00 · 2014-07-29 10:46:32 +02:00 · fcf7f03398
commit fcf7f03398
parent a9f0f8e975
1 changed files with 2 additions and 0 deletions
--- a/library/files/file
+++ b/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: