File tree Expand file tree Collapse file tree 2 files changed +5
-7
lines changed
cabal-install-solver/src/Distribution/Solver/Modular
cabal-install/tests/UnitTests/Distribution/Solver/Modular Expand file tree Collapse file tree 2 files changed +5
-7
lines changed Original file line number Diff line number Diff 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
297297showGR :: QGoalReason -> String
298298showGR UserGoal = " (user goal)"
Original file line number Diff line number Diff line change @@ -971,12 +971,10 @@ tests =
971971 [ Right $ exAv " A" 1 []
972972 , Right $ exAv " A" 2 []
973973 , Right $ exAv " A" 3 []
974- , Right $ exAv " A" 4 []
975- , Right $ exAv " A" 5 []
976- , Right $ exAv " B" 1 [ExFix " A" 6 ]
974+ , Right $ exAv " B" 1 [ExFix " A" 4 ]
977975 ]
978- rejecting = " rejecting: A-5 .0.0 (conflict: B => A==6 .0.0)"
979- skipping = " skipping: A; 4.0.0, 3.0.0, 2.0.0 and other versions (has"
976+ rejecting = " rejecting: A-3 .0.0 (conflict: B => A==4 .0.0)"
977+ skipping = " skipping: A; 2.0.0 and other versions (has"
980978 in mkTest db " show summarized skipping versions list" [" B" ] $
981979 solverFailure (\ msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg)
982980 ]
You can’t perform that action at this time.
0 commit comments