From 69127059b745b3a5dab4929587af1a1def6d6dc5 Mon Sep 17 00:00:00 2001
From: Mike Pilgrem <mpilgrem@users.noreply.github.com>
Date: Thu, 6 Apr 2023 19:54:49 +0100
Subject: [PATCH] Fix #6086 Correct warning when allow-newer-deps but
 allow-newer is false

---
 ChangeLog.md                     |  3 +++
 src/Stack/Build/ConstructPlan.hs | 12 ++++++------
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/ChangeLog.md b/ChangeLog.md
index ddc929ba71..cf6e2e0192 100644
--- 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
index 2e13a9dab0..9a44c46bcf 100644
--- 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