@@ -37,10 +37,36 @@ checkDeps allPackages (user, pb) =
3737 (dep, Just version)
3838 errMap
3939 where
40− errMap = singletonMap (user, pbVersion pb) range
40+ errMap = singletonMap pu range
41+ pu = PkgUser
42+ { puName = user
43+ , puVersion = pbVersion pb
44+ , puMaintainer = pbMaintainer pb
45+ , puGithubPings = pbGithubPings pb
46+ }
47+
48+data PkgUser = PkgUser
49+ { puName :: PackageName
50+ , puVersion :: Version
51+ , puMaintainer :: Maybe Maintainer
52+ , puGithubPings :: Set Text
53+ }
54+ deriving (Eq, Ord)
55+
56+pkgUserShow1 :: PkgUser -> String
57+pkgUserShow1 PkgUser {..} = concat
58+ [ display puName
59+ , "-"
60+ , display puVersion
61+ ]
62+
63+pkgUserShow2 :: PkgUser -> String
64+pkgUserShow2 PkgUser {..} = unwords
65+ $ (maybe "No maintainer" (unpack . unMaintainer) puMaintainer ++ ".")
66+ : map (("@" ++) . unpack) (setToList puGithubPings)
4167
4268newtype BadBuildPlan =
43− BadBuildPlan (Map (PackageName, Maybe Version) (Map (PackageName, Version) VersionRange)) -- FIXME add maintainer and Github ping info
69+ BadBuildPlan (Map (PackageName, Maybe Version) (Map PkgUser VersionRange))
4470 deriving Typeable
4571instance Exception BadBuildPlan
4672instance Show BadBuildPlan where
@@ -60,15 +86,14 @@ instance Show BadBuildPlan where
6086 , " depended on by:"
6187 ]
6288
63− showUser :: ((PackageName, Version), VersionRange) -> String
64− showUser ((user, version), range) = concat
89+ showUser :: (PkgUser, VersionRange) -> String
90+ showUser (pu, range) = concat
6591 [ "- "
66− , display user
67− , "-"
68− , display version
92+ , pkgUserShow1 pu
6993 , " ("
7094 , display range
71− , ")"
95+ , "). "
96+ , pkgUserShow2 pu
7297 ]
7398
7499instance Monoid BadBuildPlan where