[commit: ghc] wip/nfs-locking: #156, ensure the entire piece is under a removeFiles so we always clean up the garbage (3a88dc5)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : wip/nfs-locking
Link       : http://ghc.haskell.org/trac/ghc/changeset/3a88dc56215804ab95d9c5eb3127de6f4c7a5f0b/ghc

>---------------------------------------------------------------

commit 3a88dc56215804ab95d9c5eb3127de6f4c7a5f0b
Author: Neil Mitchell <ndmitchell at gmail.com>
Date:   Tue Jan 12 22:34:39 2016 +0000

    #156, ensure the entire piece is under a removeFiles so we always clean up the garbage


>---------------------------------------------------------------

3a88dc56215804ab95d9c5eb3127de6f4c7a5f0b
 src/Rules/Libffi.hs | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/src/Rules/Libffi.hs b/src/Rules/Libffi.hs
index 1d761ff..8bcfdae 100644
--- a/src/Rules/Libffi.hs
+++ b/src/Rules/Libffi.hs
@@ -82,9 +82,10 @@ libffiRules = do
         need tarballs
         let libname = dropExtension . dropExtension . takeFileName $ head tarballs
 
-        build $ fullTarget libffiTarget Tar tarballs [buildRootPath]
-        actionFinally (moveDirectory (buildRootPath -/- libname) libffiBuild) $
-            removeFiles buildRootPath [libname <//> "*"]
+        actionFinally (do
+            build $ fullTarget libffiTarget Tar tarballs [buildRootPath]
+            moveDirectory (buildRootPath -/- libname) libffiBuild) $
+                removeFiles buildRootPath [libname <//> "*"]
 
         fixFile (libffiBuild -/- "Makefile.in") fixLibffiMakefile