Fixed spill/fill "merge" reversal.

1 files changed, 7 insertions, 5 deletions

diff --git a/kiki.hs b/kiki.hs
index 0be591d..7c0c4b2 100644
--- a/kiki.hs
+++ b/kiki.hs
@@ -1310,6 +1310,8 @@ kiki "merge" args = do
         val = either (\subkeys -> if subkeys then KF_Subkeys else KF_All)
                      KF_Match
                      mtch
+
+    parseFlow :: String -> Maybe ((Bool,Bool),Either Bool String)
     parseFlow spec =
         if null bads
             then Just ( ( "spill" `elem` goods
@@ -1395,17 +1397,17 @@ kiki "merge" args = do
             Left ("access",Just "auto")   -> ( flow { access = AutoAccess }, op )
             Left ("home",mb) ->
                 ( flow
-                , op { opFiles = Map.insert HomePub flow { typ=KeyRingFile
-                                                         , access=Pub }
-                                 $ Map.insert HomeSec flow { typ=KeyRingFile
-                                                           , access=Sec }
+                , op { opFiles = Map.insert HomePub (flow { typ=KeyRingFile
+                                                          , access=Pub })
+                                 $ Map.insert HomeSec (flow { typ=KeyRingFile
+                                                            , access=Sec })
                                  $ opFiles op
                      , opHome = opHome op `mplus` mb
                      }
                 )
             Left ("flow",Just flowspec) ->
                 case parseFlow flowspec of
-                    Just ( (fil,spil), mtch ) ->
+                    Just ( (spil,fil), mtch ) ->
                         ( updateFlow fil spil mtch flow
                         , op )
                     Nothing -> error "Valid flow words are: spill,fill,sync,subkeys or match=KEYSPEC"