Fix #6086 Correct warning when allow-newer-deps but allow-newer is false

commercialhaskell · Apr 6, 2023 · 6912705 · 6912705
1 parent 9faba78
commit 6912705
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/ChangeLog.md b/ChangeLog.md
@@ -39,6 +39,9 @@ Other enhancements:
 
 Bug fixes:
 
+* Fix incorrect warning if `allow-newer-deps` are specified but `allow-newer` is
+  `false`. See
+  [#6068](https://github.com/commercialhaskell/stack/issues/6086).
 * `stack build` with `--file-watch` or `--file-watch-poll` outputs 'pretty'
   error messages, as intended. See
   [#5978](https://github.com/commercialhaskell/stack/issues/5978).

diff --git a/src/Stack/Build/ConstructPlan.hs b/src/Stack/Build/ConstructPlan.hs
@@ -875,16 +875,16 @@ addPackageDeps package = do
         inRange <- if adrVersion adr `withinRange` range
           then pure True
           else do
-            let warn_ reason = tell mempty { wWarnings = (msg:) }
+            let warn_ isIgnoring reason = tell mempty { wWarnings = (msg:) }
                  where
                   msg = T.concat
-                    [ "WARNING: Ignoring "
+                    [ if isIgnoring then "Ignoring " else "Not ignoring "
                     , T.pack $ packageNameString $ packageName package
                     , "'s bounds on "
                     , T.pack $ packageNameString depname
                     , " ("
                     , versionRangeText range
-                    , "); using "
+                    , ") and using "
                     , T.pack $ packageIdentifierString $
                         PackageIdentifier depname (adrVersion adr)
                     , ".\nReason: "
@@ -899,19 +899,19 @@ addPackageDeps package = do
                   y <- inSnapshot depname (adrVersion adr)
                   if x && y
                     then do
-                      warn_ "trusting snapshot over Cabal file dependency information"
+                      warn_ True "trusting snapshot over Cabal file dependency information"
                       pure True
                     else pure False
             if allowNewer
               then do
-                warn_ "allow-newer enabled"
+                warn_ True "allow-newer enabled"
                 case allowNewerDeps of
                   Nothing -> pure True
                   Just boundsIgnoredDeps ->
                       pure $ packageName package `elem` boundsIgnoredDeps
               else do
                 when (isJust allowNewerDeps) $
-                    warn_ "allow-newer-deps are specified but allow-newer isn't enabled"
+                    warn_ False "although allow-newer-deps are specified, allow-newer is false"
                 inSnapshotCheck
         if inRange
           then case adr of