Update 'and other versions' message

Author: erikd

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

@@ -292,7 +292,7 @@ showOptions verb q xs = showQPN q ++ "; " ++ (L.intercalate ", "
     then showOption q x
     else showI i -- Don't show the package, just the version
   | x@(POption i linkedTo) <- if verb >= verbose then xs else take 1 xs
-  ] ++ if verb < verbose && length xs >= 1 then " and other versions" else "")
+  ] ++ if verb < verbose && length xs > 1 then " and " ++ show (length xs - 1) ++" other versions" else "")
 
 showGR :: QGoalReason -> String
 showGR UserGoal            = " (user goal)"

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

@@ -996,7 +996,7 @@ tests =
                     , Right $ exAv "B" 1 [ExFix "A" 4]
                     ]
                   rejecting = "rejecting: A-3.0.0 (conflict: B => A==4.0.0)"
-                  skipping = "skipping: A; 2.0.0 and other versions (has"
+                  skipping = "skipping: A; 2.0.0 and 1 other versions (has"
                in mkTest db "show summarized skipping versions list" ["B"] $
                     solverFailure (\msg -> rejecting `isInfixOf` msg && skipping `isInfixOf` msg)
           ]