Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

solver: parse cabal errors also on Windows #2508

Merged
merged 1 commit into from
Aug 18, 2016
Merged

solver: parse cabal errors also on Windows #2508

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/Stack/Solver.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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)
Expand All @@ -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
Expand Down