#678, fix serious bug in writeFileChanged

ndmitchell · May 19, 2019 · c351bd9 · c351bd9
1 parent 7f76a27
commit c351bd9
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/CHANGES.txt b/CHANGES.txt
@@ -1,7 +1,8 @@
 Changelog for Shake (* = breaking change)
 
+    #678, fix serious bug in writeFileChanged
 0.18.1, released 2019-05-19
-    #678, fix serious bug in writeFile' - it could delete an unrelated file
+    #678, fix serious bug in writeFile', deleting the wrong file
 0.18, released 2019-05-14
 *   Make files copied to the shared cache read-only
     Delete files before writing, giving symlink/readonly safety

diff --git a/src/Development/Shake/Internal/Derived.hs b/src/Development/Shake/Internal/Derived.hs
@@ -147,7 +147,7 @@ writeFileChanged name x = liftIO $ do
             src <- hGetContents h
             return $! src /= x
         when b $ do
-            removeFile_ x -- symlink safety
+            removeFile_ name -- symlink safety
             writeFile name x