diff options
-rw-r--r-- | lib/KeyRing.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/KeyRing.hs b/lib/KeyRing.hs index cece862..d85d2eb 100644 --- a/lib/KeyRing.hs +++ b/lib/KeyRing.hs | |||
@@ -606,7 +606,7 @@ writeHostsFiles krd ctx (hostdbs0,hostdbs,u1,gpgnames,outgoing_names) = do | |||
606 | 606 | ||
607 | -- 4. for each host db H, union H with U and write it out as H' | 607 | -- 4. for each host db H, union H with U and write it out as H' |
608 | -- only if there is a non-empty diff | 608 | -- only if there is a non-empty diff |
609 | rss <- forM (zip hns $ zip hostdbs0 hostdbs) $ \(fname,(h0,h1)) -> do | 609 | rss <- forM (zip hns $ zip hostdbs0 hostdbs) $ \(fname,(h0,h1)) -> do |
610 | let h = h1 `Hosts.plus` u | 610 | let h = h1 `Hosts.plus` u |
611 | d = Hosts.diff h0 h | 611 | d = Hosts.diff h0 h |
612 | rs = map ((fname,) . HostsDiff) d | 612 | rs = map ((fname,) . HostsDiff) d |
@@ -1129,10 +1129,10 @@ try' v body = | |||
1129 | runKeyRing :: KeyRingOperation -> IO (KikiResult KeyRingRuntime) | 1129 | runKeyRing :: KeyRingOperation -> IO (KikiResult KeyRingRuntime) |
1130 | runKeyRing operation = do | 1130 | runKeyRing operation = do |
1131 | -- get homedir and keyring files + fingerprint for working key | 1131 | -- get homedir and keyring files + fingerprint for working key |
1132 | homedir <- getHomeDir (opHome operation) | 1132 | homedir <- getHomeDir (opHome operation) |
1133 | try' homedir $ \(_homedir, secring, pubring, grip0) -> do | 1133 | try' homedir $ \(_homedir, secring, pubring, grip0) -> do |
1134 | let ctx = InputFileContext secring pubring | 1134 | let ctx = InputFileContext secring pubring |
1135 | tolocks = filesToLock operation ctx | 1135 | tolocks = filesToLock operation ctx |
1136 | secring <- return Nothing | 1136 | secring <- return Nothing |
1137 | pubring <- return Nothing | 1137 | pubring <- return Nothing |
1138 | (locks :: [(Maybe DotLock, FilePath)]) <- | 1138 | (locks :: [(Maybe DotLock, FilePath)]) <- |