From acd5a541281324b85ef2a1e5a9d343f9bc91b05e Mon Sep 17 00:00:00 2001 From: joe Date: Wed, 30 Apr 2014 20:18:10 -0400 Subject: writeHostFiles now uses InputFile instead of FilePath --- KeyRing.hs | 6 +++--- 1 file 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 files istyp = do (f,stream) <- Map.toList (kFiles krd) guard (istyp stream) - resolveInputFile ctx f + return f -- resolveInputFile ctx f -- 3. add hostnames from gpg for addresses not in U let u = foldl' f u1 ans @@ -1029,8 +1029,8 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,outgoing_names) = do let h = h1 `Hosts.plus` u d = Hosts.diff h0 h rs = map ((fname,) . HostsDiff) d - unless (null d) $ L.writeFile fname $ Hosts.encode h - return rs + unless (null d) $ writeInputFileL ctx fname $ Hosts.encode h + return $ map (first $ resolveForReport $ Just ctx) rs return $ concat rss -- cgit v1.2.3