git.iko.soy/stackage
on master help sign in
Return code to match master branch
b9de1c2Michael Snoyman
Stackage/PerformBuild.hs+7−11
compare with master
unifiedsplit
@@ -180,7 +180,6 @@ performBuild' pb@PerformBuild {..} = withBuildDir $ \builddir -> do
180 $ \ClosedStream Inherited Inherited -> return ()
180 $ \ClosedStream Inherited Inherited -> return ()
181 pbLog $ encodeUtf8 "Copying built-in Haddocks\n"
181 pbLog $ encodeUtf8 "Copying built-in Haddocks\n"
182 copyBuiltInHaddocks (pbDocDir pb)
182 copyBuiltInHaddocks (pbDocDir pb)
183− pbLog $ encodeUtf8 "Finished copying built-in Haddocks\n"
184
183
185 sem <- atomically $ newTSem pbJobs
184 sem <- atomically $ newTSem pbJobs
186 active <- newTVarIO (0 :: Int)
185 active <- newTVarIO (0 :: Int)
@@ -314,7 +313,7 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
314 log' t = do
313 log' t = do
315 i <- readTVarIO sbActive
314 i <- readTVarIO sbActive
316 errs <- readTVarIO sbErrsVar
315 errs <- readTVarIO sbErrsVar
317− when False $ pbLog $ encodeUtf8 $ concat
316+ pbLog $ encodeUtf8 $ concat
318 [ t
317 [ t
319 , " (pending: "
318 , " (pending: "
320 , tshow i
319 , tshow i
@@ -486,15 +485,12 @@ singleBuild pb@PerformBuild {..} registeredPackages SingleBuild {..} =
486 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
485 warn t = atomically $ modifyTVar sbWarningsVar (. (t:))
487
486
488 updateErrs exc = do
487 updateErrs exc = do
489− case exc' of
490− DependencyFailed _ -> return ()
491− _ -> do
492− log' $ concat
488+ log' $ concat
493− [ display (piName sbPackageInfo)
489+ [ display (piName sbPackageInfo)
494− , ": "
490+ , ": "
495− , tshow exc
491+ , tshow exc
496− ]
492+ ]
497− atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
493+ atomically $ modifyTVar sbErrsVar $ insertMap (piName sbPackageInfo) exc'
498 where
494 where
499 exc' =
495 exc' =
500 case fromException exc of
496 case fromException exc of