Skip to content

Commit 37c8d14

Browse files
committed
Do not consider unregistered packages for already installed #805
1 parent 5940545 commit 37c8d14

File tree

1 file changed

+7
-1
lines changed

1 file changed

+7
-1
lines changed

src/Stack/Build/Execute.hs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -425,7 +425,7 @@ executePlan' installedMap plan ee@ExecuteEnv {..} = do
425425
-- stack always using transformer stacks that are safe for this use case.
426426
runInBase <- liftBaseWith $ \run -> return (void . run)
427427

428-
let actions = concatMap (toActions installedMap runInBase ee) $ Map.elems $ Map.mergeWithKey
428+
let actions = concatMap (toActions installedMap' runInBase ee) $ Map.elems $ Map.mergeWithKey
429429
(\_ b f -> Just (Just b, Just f))
430430
(fmap (\b -> (Just b, Nothing)))
431431
(fmap (\f -> (Nothing, Just f)))
@@ -467,6 +467,12 @@ executePlan' installedMap plan ee@ExecuteEnv {..} = do
467467
generateDepsHaddockIndex eeEnvOverride wc eeBaseConfigOpts eeLocals
468468
generateSnapHaddockIndex eeEnvOverride wc eeBaseConfigOpts eeGlobalDB
469469
when (toCoverage $ boptsTestOpts eeBuildOpts) generateHpcMarkupIndex
470+
where
471+
installedMap' = Map.difference installedMap
472+
$ Map.fromList
473+
$ map (\gid -> (packageIdentifierName $ ghcPkgIdPackageIdentifier gid, ()))
474+
$ Map.keys
475+
$ planUnregisterLocal plan
470476

471477
toActions :: M env m
472478
=> InstalledMap

0 commit comments

Comments
 (0)