diff options
author | joe <joe@jerkface.net> | 2014-05-06 01:58:11 -0400 |
---|---|---|
committer | joe <joe@jerkface.net> | 2014-05-06 01:58:11 -0400 |
commit | 4f495163b6ff423baee8306098152a0435dcdc89 (patch) | |
tree | f1c0c45ee74a2aea0eb6767df0bfa637adb53577 | |
parent | 94efc2744b7d6288dd08b7e3f74337345ae0efb0 (diff) |
--home files are always --type=keyring regardless of prior option.
-rw-r--r-- | kiki.hs | 6 |
1 files changed, 4 insertions, 2 deletions
@@ -982,8 +982,10 @@ kiki "merge" args = do | |||
982 | Left ("access",Just "auto") -> ( flow { access = AutoAccess }, op ) | 982 | Left ("access",Just "auto") -> ( flow { access = AutoAccess }, op ) |
983 | Left ("home",mb) -> | 983 | Left ("home",mb) -> |
984 | ( flow | 984 | ( flow |
985 | , op { opFiles = Map.insert HomePub flow { access=Pub } | 985 | , op { opFiles = Map.insert HomePub flow { typ=KeyRingFile |
986 | $ Map.insert HomeSec flow { access=Sec } | 986 | , access=Pub } |
987 | $ Map.insert HomeSec flow { typ=KeyRingFile | ||
988 | , access=Sec } | ||
987 | $ opFiles op | 989 | $ opFiles op |
988 | , opHome = opHome op `mplus` mb | 990 | , opHome = opHome op `mplus` mb |
989 | } | 991 | } |