Skip to content

Commit 6c3a718

Browse files
committed
Reduce show skipped versions from 3 to 1
And fix associated unit test expected string.
1 parent e1c25bd commit 6c3a718

File tree

2 files changed

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

2 files changed

+5
-7
lines changed

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,8 @@ showOptions verb q xs = showQPN q ++ "; " ++ (L.intercalate ", "
291291
[if isJust linkedTo
292292
then showOption q x
293293
else showI i -- Don't show the package, just the version
294-
| x@(POption i linkedTo) <- if verb >= verbose then xs else take 3 xs
295-
] ++ if verb < verbose && length xs >= 3 then " and other versions" else "")
294+
| x@(POption i linkedTo) <- if verb >= verbose then xs else take 1 xs
295+
] ++ if verb < verbose && length xs >= 1 then " and other versions" else "")
296296

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

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

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -993,12 +993,10 @@ tests =
993993
[ Right $ exAv "A" 1 []
994994
, Right $ exAv "A" 2 []
995995
, Right $ exAv "A" 3 []
996-
, Right $ exAv "A" 4 []
997-
, Right $ exAv "A" 5 []
998-
, Right $ exAv "B" 1 [ExFix "A" 6]
996+
, Right $ exAv "B" 1 [ExFix "A" 4]
999997
]
1000-
rejecting = "rejecting: A-5.0.0 (conflict: B => A==6.0.0)"
1001-
skipping = "skipping: A; 4.0.0, 3.0.0, 2.0.0 and other versions (has"
998+
rejecting = "rejecting: A-3.0.0 (conflict: B => A==4.0.0)"
999+
skipping = "skipping: A; 2.0.0 and other versions (has"
10021000
in mkTest db "show summarized skipping versions list" ["B"] $
10031001
solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg)
10041002
]

0 commit comments

Comments
 (0)