diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-02-03 16:48:40 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-02-03 16:48:40 -0400 |
| commit | 44b115e0b11b3cb64301ed6dc478c597062ac0b6 (patch) | |
| tree | 5ca8be141278790fcf1ca0c6a739fa68ccc59415 /Remote | |
| parent | d8fb97806c430be8358b2b77d67c02e876278d2f (diff) | |
| parent | 146c36ca545a297f1e44e3cf2c91f3c0e17c909f (diff) | |
Merge branch 'master' into ghc7.4
Conflicts:
Utility/Misc.hs
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/Bup.hs | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/Remote/Bup.hs b/Remote/Bup.hs index 9b54d8c85..50c3b10b3 100644 --- a/Remote/Bup.hs +++ b/Remote/Bup.hs @@ -8,7 +8,6 @@ module Remote.Bup (remote) where import qualified Data.ByteString.Lazy.Char8 as L -import System.IO.Error import qualified Data.Map as M import System.Process @@ -200,7 +199,7 @@ getBupUUID :: Git.Repo -> UUID -> Annex (UUID, Git.Repo) getBupUUID r u | Git.repoIsUrl r = return (u, r) | otherwise = liftIO $ do - ret <- try $ Git.Config.read r + ret <- tryIO $ Git.Config.read r case ret of Right r' -> return (toUUID $ Git.Config.get "annex.uuid" "" r', r') Left _ -> return (NoUUID, r) |