X-Git-Url: http://git.megacz.com/?p=ghc-hetmet.git;a=blobdiff_plain;f=distrib%2Fcompare%2FFilenameDescr.hs;fp=distrib%2Fcompare%2FFilenameDescr.hs;h=c1a85954e651f6a7fefa945cdccd14fa4e4ba39a;hp=4b5898e990c441bb9e9a43d141032efabfcdea3c;hb=90d7a88f304ddff15f31f9b1edb86b452679583b;hpb=cb28985ec37f65a8fee697e2b6d359626a44a41a diff --git a/distrib/compare/FilenameDescr.hs b/distrib/compare/FilenameDescr.hs index 4b5898e..c1a8595 100644 --- a/distrib/compare/FilenameDescr.hs +++ b/distrib/compare/FilenameDescr.hs @@ -13,6 +13,7 @@ import Tar -- abstracts out the version numbers. type FilenameDescr = [FilenameDescrBit] data FilenameDescrBit = VersionOf String + | HashOf String | FP String | Ways deriving (Show, Eq, Ord) @@ -45,5 +46,9 @@ flattenFilenameDescr buildInfo fd = case partitionEithers (map f fd) of = case lookup thing (biThingVersionMap buildInfo) of Just v -> Right v Nothing -> Left ["Can't happen: thing has no version in mapping"] + f (HashOf thing) + = case lookup thing (biThingHashMap buildInfo) of + Just v -> Right v + Nothing -> Left ["Can't happen: thing has no hash in mapping"] f Ways = Right $ intercalate "-" $ biWays buildInfo