diff options
| author |  Joey Hess <joey@kitenet.net> | 2011-05-17 11:44:13 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2011-05-17 11:45:24 -0400 |
| commit | 21d9c84e7292a8984ea5d46c0134ddc6ff19babc (patch) | |
| tree | 4ad29fe99c515c5d8fd27233c88611a8f792ec2d /Remote/Bup.hs | |
| parent | c91929f6934fc4e94603d0fa004e824d5e2cfb65 (diff) | |
more standard names for whenM and unlessM operators
These are defined in ifelse, but it's not currently available and I don't
want to pull in a library for 6 lines of code anyhow.
Also, ifelse sets the fixity to 1, which does not allow >>? error $ ...
Diffstat (limited to 'Remote/Bup.hs')
| -rw-r--r-- | Remote/Bup.hs | 4 |
1 files changed, 2 insertions, 2 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" "" |