Skip to content

Commit 9cb2ff6

Browse files
committed
Change earlier to other in skipped versions msg
1 parent 4a9cef2 commit 9cb2ff6

File tree

2 files changed

+2
-2
lines changed
  • cabal-install-solver/src/Distribution/Solver/Modular
  • cabal-install/tests/UnitTests/Distribution/Solver/Modular

2 files changed

+2
-2
lines changed

cabal-install-solver/src/Distribution/Solver/Modular/Message.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ showOptions q xs = showQPN q ++ "; " ++ (L.intercalate ", "
291291
then showOption q x
292292
else showI i -- Don't show the package, just the version
293293
| x@(POption i linkedTo) <- take 3 xs
294-
] ++ if length xs >= 3 then " and earlier versions" else "")
294+
] ++ if length xs >= 3 then " and other versions" else "")
295295

296296
showGR :: QGoalReason -> String
297297
showGR UserGoal = " (user goal)"

cabal-install/tests/UnitTests/Distribution/Solver/Modular/Solver.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -996,7 +996,7 @@ tests =
996996
, Right $ exAv "B" 1 [ExFix "A" 6]
997997
]
998998
rejecting = "rejecting: A-5.0.0 (conflict: B => A==6.0.0)"
999-
skipping = "skipping: A; 4.0.0, 3.0.0, 2.0.0 and earlier versions (has"
999+
skipping = "skipping: A; 4.0.0, 3.0.0, 2.0.0 and other versions (has"
10001000
in mkTest db "show summarized skipping versions list" ["B"] $
10011001
solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg)
10021002
]

0 commit comments

Comments
 (0)