@@ -205,7 +205,8 @@ configureAction (configFlags, configExFlags) extraArgs globalFlags = do
205
205
globalFlags' = savedGlobalFlags config `mappend` globalFlags
206
206
(comp, platform, conf) <- configCompilerAux configFlags'
207
207
configure verbosity
208
- (configPackageDB' configFlags') (globalRepos globalFlags')
208
+ (configPackageDB' configFlags' DontForceGlobalInstall )
209
+ (globalRepos globalFlags')
209
210
comp platform conf configFlags' configExFlags' extraArgs
210
211
211
212
buildAction :: BuildFlags -> [String ] -> GlobalFlags -> IO ()
@@ -376,7 +377,8 @@ installAction (configFlags, configExFlags, installFlags, haddockFlags)
376
377
globalFlags' = savedGlobalFlags config `mappend` globalFlags
377
378
(comp, platform, conf) <- configCompilerAux' configFlags'
378
379
install verbosity
379
- (configPackageDB' configFlags') (globalRepos globalFlags')
380
+ (configPackageDB' configFlags' DontForceGlobalInstall )
381
+ (globalRepos globalFlags')
380
382
comp platform conf globalFlags' configFlags' configExFlags'
381
383
installFlags' haddockFlags
382
384
targets
@@ -423,7 +425,7 @@ listAction listFlags extraArgs globalFlags = do
423
425
globalFlags' = savedGlobalFlags config `mappend` globalFlags
424
426
(comp, _, conf) <- configCompilerAux' configFlags
425
427
list verbosity
426
- (configPackageDB' configFlags)
428
+ (configPackageDB' configFlags DontForceGlobalInstall )
427
429
(globalRepos globalFlags')
428
430
comp
429
431
conf
@@ -439,7 +441,7 @@ infoAction infoFlags extraArgs globalFlags = do
439
441
globalFlags' = savedGlobalFlags config `mappend` globalFlags
440
442
(comp, _, conf) <- configCompilerAux configFlags
441
443
info verbosity
442
- (configPackageDB' configFlags)
444
+ (configPackageDB' configFlags DontForceGlobalInstall )
443
445
(globalRepos globalFlags')
444
446
comp
445
447
conf
@@ -480,7 +482,8 @@ fetchAction fetchFlags extraArgs globalFlags = do
480
482
globalFlags' = savedGlobalFlags config `mappend` globalFlags
481
483
(comp, platform, conf) <- configCompilerAux' configFlags
482
484
fetch verbosity
483
- (configPackageDB' configFlags) (globalRepos globalFlags')
485
+ (configPackageDB' configFlags DontForceGlobalInstall )
486
+ (globalRepos globalFlags')
484
487
comp platform conf globalFlags' fetchFlags
485
488
targets
486
489
@@ -582,7 +585,7 @@ initAction initFlags _extraArgs globalFlags = do
582
585
let configFlags = savedConfigureFlags config
583
586
(comp, _, conf) <- configCompilerAux' configFlags
584
587
initCabal verbosity
585
- (configPackageDB' configFlags)
588
+ (configPackageDB' configFlags DontForceGlobalInstall )
586
589
comp
587
590
conf
588
591
initFlags
@@ -623,11 +626,16 @@ win32SelfUpgradeAction _ _ _ = return ()
623
626
-- Utils (transitionary)
624
627
--
625
628
626
- configPackageDB' :: ConfigFlags -> PackageDBStack
627
- configPackageDB' cfg =
629
+ data ForceGlobalInstall = DontForceGlobalInstall
630
+ | ForceGlobalInstall
631
+
632
+ configPackageDB' :: ConfigFlags -> ForceGlobalInstall -> PackageDBStack
633
+ configPackageDB' cfg force =
628
634
interpretPackageDbFlags userInstall (configPackageDBs cfg)
629
635
where
630
- userInstall = fromFlagOrDefault True (configUserInstall cfg)
636
+ userInstall = case force of
637
+ ForceGlobalInstall -> False
638
+ DontForceGlobalInstall -> fromFlagOrDefault True (configUserInstall cfg)
631
639
632
640
configCompilerAux' :: ConfigFlags
633
641
-> IO (Compiler , Platform , ProgramConfiguration )
0 commit comments