diff options
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Bup.hs | 4 | ||||
| -rw-r--r-- | Remote/Directory.hs | 2 | ||||
| -rw-r--r-- | Remote/Rsync.hs | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 51a5d05d1..c40826e5e 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -75,7 +75,7 @@ bupSetup u c = do -- bup init will create the repository. -- (If the repository already exists, bup init again appears safe.) showNote "bup init" - bup "init" buprepo [] <|> error "bup init failed" + bup "init" buprepo [] >>! error "bup init failed" storeBupUUID u buprepo @@ -173,7 +173,7 @@ storeBupUUID u buprepo = do showNote "storing uuid" onBupRemote r boolSystem "git" [Params $ "config annex.uuid " ++ u] - <|> error "ssh failed" + >>! error "ssh failed" else liftIO $ do r' <- Git.configRead r let olduuid = Git.configGet r' "annex.uuid" "" diff --git a/Remote/Directory.hs b/Remote/Directory.hs index f69aa1256..dedab473f 100644 --- a/Remote/Directory.hs +++ b/Remote/Directory.hs @@ -63,7 +63,7 @@ directorySetup u c = do let dir = maybe (error "Specify directory=") id $ M.lookup "directory" c liftIO $ doesDirectoryExist dir - <|> error $ "Directory does not exist: " ++ dir + >>! error $ "Directory does not exist: " ++ dir c' <- encryptionSetup c -- The directory is stored in git config, not in this remote's diff --git a/Remote/Rsync.hs b/Remote/Rsync.hs index 53418a9ef..9d32ad19b 100644 --- a/Remote/Rsync.hs +++ b/Remote/Rsync.hs @@ -169,7 +169,7 @@ withRsyncScratchDir a = do return res where nuke d = liftIO $ - doesDirectoryExist d <&> removeDirectoryRecursive d + doesDirectoryExist d >>? removeDirectoryRecursive d rsyncRemote :: RsyncOpts -> [CommandParam] -> Annex Bool rsyncRemote o params = do |