on master help sign in
Return code to match master branch
commitb9de1c28cd7cfe3a74bc3a9a70485903a99ac6ce authorMichael Snoyman <michael@snoyman.com> dateWed 18 Mar 2015, 15:47 (12 years ago) parentb83e569
1 file changed+7−11
Stackage/PerformBuild.hs+7−11
Stackage/PerformBuild.hs+7−11
@@ -180,7 +180,6 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
180180 $ \ClosedStream Inherited Inherited -> return ()
181181 pbLog $ encodeUtf8 "Copying built-in Haddocks\n"
182182 copyBuiltInHaddocks (pbDocDir pb)
183− pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n"
184183
185184 sem <- atomically $ newTSem pbJobs
186185 active <- newTVarIO (0 :: Int)
@@ -314,7 +313,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
314313 log' t = do
315314 i <- readTVarIO sbActive
316315 errs <- readTVarIO sbErrsVar
317− when False $ pbLog $ encodeUtf8 $ concat
316+ pbLog $ encodeUtf8 $ concat
318317 [ t
319318 , " (pending: "
320319 , tshow i
@@ -486,15 +485,12 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
486485 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
487486
488487 updateErrs exc = do
489− case exc' of
490− DependencyFailed _ -> return ()
491− _ -> do
492− log' $ concat
493− [ display (piName sbPackageInfo)
494− , ": "
495− , tshow exc
496− ]
497− atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
488+ log' $ concat
489+ [ display (piName sbPackageInfo)
490+ , ": "
491+ , tshow exc
492+ ]
493+ atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
498494 where
499495 exc' =
500496 case fromException exc of