Skip to content

Commit

Permalink
Do not consider unregistered packages for already installed #805
Browse files Browse the repository at this point in the history
  • Loading branch information
snoyberg committed Aug 19, 2015
1 parent 5940545 commit 37c8d14
Showing 1 changed file with 7 additions and 1 deletion.
8 changes: 7 additions & 1 deletion src/Stack/Build/Execute.hs
Original file line number Diff line number Diff line change
Expand Up @@ -425,7 +425,7 @@ executePlan' installedMap plan ee@ExecuteEnv {..} = do
-- stack always using transformer stacks that are safe for this use case.
runInBase <- liftBaseWith $ \run -> return (void . run)

let actions = concatMap (toActions installedMap runInBase ee) $ Map.elems $ Map.mergeWithKey
let actions = concatMap (toActions installedMap' runInBase ee) $ Map.elems $ Map.mergeWithKey
(\_ b f -> Just (Just b, Just f))
(fmap (\b -> (Just b, Nothing)))
(fmap (\f -> (Nothing, Just f)))
Expand Down Expand Up @@ -467,6 +467,12 @@ executePlan' installedMap plan ee@ExecuteEnv {..} = do
generateDepsHaddockIndex eeEnvOverride wc eeBaseConfigOpts eeLocals
generateSnapHaddockIndex eeEnvOverride wc eeBaseConfigOpts eeGlobalDB
when (toCoverage $ boptsTestOpts eeBuildOpts) generateHpcMarkupIndex
where
installedMap' = Map.difference installedMap
$ Map.fromList
$ map (\gid -> (packageIdentifierName $ ghcPkgIdPackageIdentifier gid, ()))
$ Map.keys
$ planUnregisterLocal plan

toActions :: M env m
=> InstalledMap
Expand Down

0 comments on commit 37c8d14

Please sign in to comment.