From b9de1c28cd7cfe3a74bc3a9a70485903a99ac6ce Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Wed, 18 Mar 2015 15:47:25 +0200
Subject: [PATCH] Return code to match master branch

---
 Stackage/PerformBuild.hs | 18 +++++++-----------
 1 file changed, 7 insertions(+), 11 deletions(-)

diff --git a/Stackage/PerformBuild.hs b/Stackage/PerformBuild.hs
index e64fbd07..06c1edc6 100644
--- a/Stackage/PerformBuild.hs
+++ b/Stackage/PerformBuild.hs
@@ -180,7 +180,6 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
                 $ \ClosedStream Inherited Inherited -> return ()
     pbLog $ encodeUtf8 "Copying built-in Haddocks\n"
     copyBuiltInHaddocks (pbDocDir pb)
-    pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n"
 
     sem <- atomically $ newTSem pbJobs
     active <- newTVarIO (0 :: Int)
@@ -314,7 +313,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
     log' t = do
         i <- readTVarIO sbActive
         errs <- readTVarIO sbErrsVar
-        when False $ pbLog $ encodeUtf8 $ concat
+        pbLog $ encodeUtf8 $ concat
             [ t
             , " (pending: "
             , tshow i
@@ -486,15 +485,12 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
     warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
 
     updateErrs exc = do
-        case exc' of
-            DependencyFailed _ -> return ()
-            _ -> do
-                log' $ concat
-                    [ display (piName sbPackageInfo)
-                    , ": "
-                    , tshow exc
-                    ]
-                atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
+        log' $ concat
+            [ display (piName sbPackageInfo)
+            , ": "
+            , tshow exc
+            ]
+        atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
       where
         exc' =
             case fromException exc of