Commit 82c8a997 authored by David Himmelstrup's avatar David Himmelstrup
Browse files

Ignoring user packages when installing locally doesn't make sense.

parent b92a6b1b
......@@ -121,7 +121,7 @@ mkConfigFlags cfg
= do runHc <- findProgramOrDie "runhaskell" (tempRunHc cfg)
tarProg <- findProgramOrDie "tar" (tempTarPath cfg)
comp <- Configure.configCompiler (tempHcFlavor cfg) (tempHcPath cfg) (tempHcPkg cfg) (tempVerbose cfg)
let userIns = tempUserIns cfg || tempUser cfg
let userIns = tempUserIns cfg
localConfig <- localConfigDir
prefix <- if userIns
then fmap Just (maybe localPrefix return (tempPrefix cfg))
......
......@@ -43,7 +43,6 @@ emptyTempFlags = TempFlags {
tempTarPath = Nothing,
tempVerbose = 3,
-- tempUpgradeDeps = False,
tempUser = False,
tempUserIns = False
}
......@@ -80,10 +79,6 @@ globalOptions =
"upon registration, register this package in the user's local package database"
, Option "" ["global-install"] (NoArg GlobalInstallFlag)
"upon registration, register this package in the system-wide package database"
, Option "" ["user-deps"] (NoArg UserFlag)
"allow dependencies to be satisfied from the user package database"
, Option "" ["global-deps"] (NoArg GlobalFlag)
"(default) dependencies must be satisfied from the global package database"
]
data Cmd = Cmd {
......@@ -159,8 +154,6 @@ mkTempFlags = updateCfg
WithServer url -> t { tempServers = url:tempServers t }
Verbose n -> t { tempVerbose = n }
-- UpgradeDeps -> t { tempUpgradeDeps = True }
UserFlag -> t { tempUser = True }
GlobalFlag -> t { tempUser = False }
UserInstallFlag -> t { tempUserIns = True }
GlobalInstallFlag -> t { tempUserIns = False }
_ -> error $ "Unexpected flag!"
......
......@@ -50,7 +50,6 @@ data TempFlags = TempFlags {
tempRunHc :: Maybe FilePath,
tempVerbose :: Int, -- ^verbosity level
-- tempUpgradeDeps :: Bool,
tempUser :: Bool, -- ^--user flag
tempUserIns :: Bool -- ^--user-install flag
}
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment