haskell/stackage
1
0
Fork 0
mirror of https://github.com/commercialhaskell/stackage.git synced 2026-01-20 11:11:58 +01:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Return code to match master branch

Browse Source
This commit is contained in:
Michael Snoyman 2015-03-18 15:47:25 +02:00
parent b83e569b66
commit b9de1c28cd
1 changed files with 7 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
Stackage/PerformBuild.hs
View File

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