From 8f74bbee495532162ab3d58225ff0a9661ccc019 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Sat, 14 Mar 2015 20:47:14 +0200
Subject: [PATCH] Delete previous results when unregistering

Previously, package install status was determined by checking the
package database. However, this didn't work for executables, so I
switched it to keep explicit track of build results. I forgot to then
clear those results when unregistering a package.

Pinging @manny-fp @chrisdone
---
 Stackage/GhcPkg.hs       | 11 +++++++----
 Stackage/PerformBuild.hs |  1 +
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/Stackage/GhcPkg.hs b/Stackage/GhcPkg.hs
index 1e5171d8..8f9f9431 100644
--- a/Stackage/GhcPkg.hs
+++ b/Stackage/GhcPkg.hs
@@ -28,15 +28,16 @@ setupPackageDatabase
     -> FilePath -- ^ documentation root
     -> (ByteString -> IO ()) -- ^ logging
     -> Map PackageName Version -- ^ packages and versions to be installed
+    -> (PackageIdentifier -> IO ()) -- ^ callback to be used when unregistering a package
     -> IO (Set PackageName) -- ^ packages remaining in the database after cleanup
-setupPackageDatabase mdb docDir log' toInstall = do
+setupPackageDatabase mdb docDir log' toInstall onUnregister = do
     registered1 <- getRegisteredPackages flags
     forM_ registered1 $ \pi@(PackageIdentifier name version) ->
         case lookup name toInstall of
-            Just version' | version /= version' -> unregisterPackage log' docDir flags pi
+            Just version' | version /= version' -> unregisterPackage log' onUnregister docDir flags pi
             _ -> return ()
     broken <- getBrokenPackages flags
-    forM_ broken $ unregisterPackage log' docDir flags
+    forM_ broken $ unregisterPackage log' onUnregister docDir flags
     foldMap (\(PackageIdentifier name _) -> singletonSet name)
         <$> getRegisteredPackages flags
   where
@@ -78,10 +79,12 @@ parsePackageIdent = fmap fst .
 
 -- | Unregister a package.
 unregisterPackage :: (ByteString -> IO ()) -- ^ log func
+                  -> (PackageIdentifier -> IO ()) -- ^ callback to be used when unregistering a package
                   -> FilePath -- ^ doc directory
                   -> [String] -> PackageIdentifier -> IO ()
-unregisterPackage log' docDir flags ident@(PackageIdentifier name _) = do
+unregisterPackage log' onUnregister docDir flags ident@(PackageIdentifier name _) = do
     log' $ "Unregistering " ++ encodeUtf8 (display ident) ++ "\n"
+    onUnregister ident
     void (readProcessWithExitCode
               "ghc-pkg"
               ("unregister": flags ++ ["--force", unpack $ display name])
diff --git a/Stackage/PerformBuild.hs b/Stackage/PerformBuild.hs
index d922dab9..02fa14b7 100644
--- a/Stackage/PerformBuild.hs
+++ b/Stackage/PerformBuild.hs
@@ -198,6 +198,7 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
         (pbDocDir pb)
         pbLog
         (ppVersion <$> bpPackages pbPlan)
+        (deletePreviousResults pb)
 
     forM_ packageMap $ \pi -> void $ async $ singleBuild pb registeredPackages
       SingleBuild