summaryrefslogtreecommitdiff
path: root/KeyRing.hs
diff options
context:
space:
mode:
authorjoe <joe@jerkface.net>2014-04-30 20:18:10 -0400
committerjoe <joe@jerkface.net>2014-04-30 20:18:10 -0400
commitacd5a541281324b85ef2a1e5a9d343f9bc91b05e (patch)
tree919cf324413c5cd793fb3c48c7a6baa68ec80a31 /KeyRing.hs
parent6a6cc6675271205e4759383456118f5dc33f617b (diff)
writeHostFiles now uses InputFile instead of FilePath
Diffstat (limited to 'KeyRing.hs')
-rw-r--r--KeyRing.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/KeyRing.hs b/KeyRing.hs
index 40835ce..6f73fae 100644
--- a/KeyRing.hs
+++ b/KeyRing.hs
@@ -1012,7 +1012,7 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,outgoing_names) = do
1012 files istyp = do 1012 files istyp = do
1013 (f,stream) <- Map.toList (kFiles krd) 1013 (f,stream) <- Map.toList (kFiles krd)
1014 guard (istyp stream) 1014 guard (istyp stream)
1015 resolveInputFile ctx f 1015 return f -- resolveInputFile ctx f
1016 1016
1017 -- 3. add hostnames from gpg for addresses not in U 1017 -- 3. add hostnames from gpg for addresses not in U
1018 let u = foldl' f u1 ans 1018 let u = foldl' f u1 ans
@@ -1029,8 +1029,8 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,outgoing_names) = do
1029 let h = h1 `Hosts.plus` u 1029 let h = h1 `Hosts.plus` u
1030 d = Hosts.diff h0 h 1030 d = Hosts.diff h0 h
1031 rs = map ((fname,) . HostsDiff) d 1031 rs = map ((fname,) . HostsDiff) d
1032 unless (null d) $ L.writeFile fname $ Hosts.encode h 1032 unless (null d) $ writeInputFileL ctx fname $ Hosts.encode h
1033 return rs 1033 return $ map (first $ resolveForReport $ Just ctx) rs
1034 return $ concat rss 1034 return $ concat rss
1035 1035
1036 1036