Skip to content

Commit 8d7c173

Browse files
committed
wip
1 parent c57e20c commit 8d7c173

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

cabal-install/src/Distribution/Client/CmdOutdated.hs

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -141,10 +141,11 @@ outdatedAction flags _extraArgs globalFlags = do
141141
if v2FreezeFile
142142
then do
143143
putStrLn "\n\n***** v2FreezeFile ******\n"
144-
let mprojectDir = flagToMaybe . flagProjectDir $ projectFlags flags
145-
mprojectFile = flagToMaybe . flagProjectFile $ projectFlags flags
146-
when (isJust mprojectDir || isJust mprojectFile) $
144+
let mprojectDir = flagToMaybe $ flagProjectDir (projectFlags flags)
145+
mprojectFile = flagToMaybe $ flagProjectFile (projectFlags flags)
146+
when (not newFreezeFile && (isJust mprojectDir || isJust mprojectFile)) $
147147
dieWithException verbosity OutdatedAction
148+
148149
(comp, platform, _progdb) <- runRebuild (distProjectRootDirectory $ distDirLayout prjBasedCtxt) $
149150
configureCompiler verbosity (distDirLayout prjBasedCtxt) (projectConfig prjBasedCtxt)
150151
V1Outdated.depsFromNewFreezeFile verbosity globalFlags comp platform mprojectDir mprojectFile
@@ -173,12 +174,14 @@ outdatedAction flags _extraArgs globalFlags = do
173174
outdatedFlags :: OutdatedFlags
174175
outdatedFlags = extraFlags flags
175176

176-
v2FreezeFile, simpleOutput, exitCode, quiet :: Bool
177+
v2FreezeFile, newFreezeFile, simpleOutput, exitCode, quiet :: Bool
177178
v2FreezeFile = fromFlagOrDefault False $ outdatedNewFreezeFile outdatedFlags
179+
newFreezeFile = fromFlagOrDefault False $ outdatedNewFreezeFile outdatedFlags
178180
simpleOutput = fromFlagOrDefault False $ outdatedSimpleOutput outdatedFlags
179181
exitCode = fromFlagOrDefault quiet $ outdatedExitCode outdatedFlags
180182
quiet = fromFlagOrDefault False $ outdatedQuiet outdatedFlags
181183

184+
182185
ignorePred :: PackageName -> Bool
183186
ignorePred =
184187
let ignoreSet = Set.fromList $ outdatedIgnore outdatedFlags

0 commit comments

Comments
 (0)