yogsototh/stack
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #1726 from harendra-kumar/stack-init

Browse source 
Do not repeat printing of package flags
This commit is contained in:
Michael Sloan 2016-02-02 23:43:23 -08:00
commit d1aeefda66
1 changed files with 10 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
src/Stack/BuildPlan.hs
View file

@ -783,13 +783,15 @@ showCompilerErrors flags errs compiler =
showDepErrors :: Map PackageName (Map FlagName Bool) -> DepErrors -> Text
showDepErrors flags errs =
T.concat $ map formatError (Map.toList errs)
T.concat
[ T.concat $ map formatError (Map.toList errs)
,"User package flags used:\n"
, T.concat (map showFlags userPkgs)
]
where
formatError (depName, DepError mversion neededBy) = T.concat
[ showDepVersion depName mversion
, T.concat (map showRequirement (Map.toList neededBy))
-- TODO only in debug
, T.concat (map showFlags (Map.toList neededBy))
]
showDepVersion depName mversion = T.concat
@ -812,15 +814,15 @@ showDepErrors flags errs =
, "\n"
]
showFlags (user, _) =
maybe "" (printFlags user) (Map.lookup user flags)
userPkgs = Map.keys $ Map.unions (Map.elems (fmap deNeededBy errs))
showFlags pkg = maybe "" (printFlags pkg) (Map.lookup pkg flags)
printFlags user fl =
printFlags pkg fl =
if (not $ Map.null fl) then
T.concat
[ " - "
, T.pack $ packageNameString user
, " flags: "
, T.pack $ packageNameString pkg
, ": "
, T.pack $ intercalate ", "
$ map formatFlags (Map.toList fl)
, "\n"