summaryrefslogtreecommitdiff
path: root/Types
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-11-09 18:33:15 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-11-09 18:33:15 -0400
commitd3e1a3619ff6939367f43cbd46131b7f60ef6bd0 (patch)
treebc7e29364f11d3369730b0b61ad58e942b95d1cf /Types
parent2934a65ac5bbab5ac127c495c8c2492e729c2b67 (diff)
safer inannex checking
git-annex-shell inannex now returns always 0, 1, or 100 (the last when it's unclear if content is currently in the index due to it currently being moved or dropped). (Actual locking code still not yet written.)
Diffstat (limited to 'Types')
-rw-r--r--Types/Remote.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Types/Remote.hs b/Types/Remote.hs
index 0a4a0fa88..ec9b7a7a7 100644
--- a/Types/Remote.hs
+++ b/Types/Remote.hs
@@ -9,7 +9,6 @@
module Types.Remote where
-import Control.Exception
import Data.Map as M
import Data.Ord
@@ -46,8 +45,8 @@ data Remote a = Remote {
-- removes a key's contents
removeKey :: Key -> a Bool,
-- Checks if a key is present in the remote; if the remote
- -- cannot be accessed returns a Left error.
- hasKey :: Key -> a (Either IOException Bool),
+ -- cannot be accessed returns a Left error message.
+ hasKey :: Key -> a (Either String Bool),
-- Some remotes can check hasKey without an expensive network
-- operation.
hasKeyCheap :: Bool,