Merge pull request #2508 from commercialhaskell/parse-cabal-errors-wi…

…ndows solver: parse cabal errors also on Windows
commercialhaskell · Aug 18, 2016 · dd2ca01 · dd2ca01
2 parents 5607c06 + 9b90488
commit dd2ca01
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/Stack/Solver.hs b/src/Stack/Solver.hs
@@ -136,6 +136,7 @@ cabalSolver menv cabalfps constraintType
 
   where
     errCheck = T.isInfixOf "Could not resolve dependencies"
+    linesNoCR = map stripCR . T.lines
     cabalBuildErrMsg e =
                ">>>> Cabal errors begin\n"
             <> e
@@ -167,7 +168,7 @@ cabalSolver menv cabalfps constraintType
         else errExit msg
 
     parseConflictingPkgs msg =
-        let ls = dropWhile (not . errCheck) $ T.lines msg
+        let ls = dropWhile (not . errCheck) $ linesNoCR msg
             select s = ((T.isPrefixOf "trying:" s)
                       || (T.isPrefixOf "next goal:" s))
                       && (T.isSuffixOf "(user goal)" s)
@@ -180,8 +181,7 @@ cabalSolver menv cabalfps constraintType
     parseCabalOutput bs = do
         let ls = drop 1
                $ dropWhile (not . T.isPrefixOf "In order, ")
-               $ map stripCR
-               $ T.lines
+               $ linesNoCR
                $ decodeUtf8 bs
             (errs, pairs) = partitionEithers $ map parseCabalOutputLine ls
         if null errs