summaryrefslogtreecommitdiff
path: root/Backend
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2010-10-14 19:36:11 -0400
committerGravatar Joey Hess <joey@kitenet.net>2010-10-14 19:36:11 -0400
commitb8ba60428a0b4c077482560757e830e9ba02a823 (patch)
tree68c247edd2570d9121c150b35838f114eb9f994e /Backend
parentc4959fee47f168857998dea6d11395158251158d (diff)
changed key to include backend name
Diffstat (limited to 'Backend')
-rw-r--r--Backend/File.hs6
1 files changed, 3 insertions, 3 deletions
diff --git a/Backend/File.hs b/Backend/File.hs
index def2f3091..6267b478a 100644
--- a/Backend/File.hs
+++ b/Backend/File.hs
@@ -29,7 +29,7 @@ backend = Backend {
-- direct mapping from filename to key
keyValue :: FilePath -> Annex (Maybe Key)
-keyValue file = return $ Just $ Key file
+keyValue file = return $ Just $ Key ((name backend), file)
{- This backend does not really do any independant data storage,
- it relies on the file contents in .git/annex/ in this repo,
@@ -44,7 +44,7 @@ dummyRemove url = return True
{- Just check if the .git/annex/ file for the key exists. -}
checkKeyFile :: Key -> Annex Bool
-checkKeyFile k = inAnnex backend k
+checkKeyFile k = inAnnex k
{- Try to find a copy of the file in one of the remotes,
- and copy it over to this one. -}
@@ -97,4 +97,4 @@ copyFromRemote r key file = do
then return ()
else error "cp failed"
getremote = error "get via network not yet implemented!"
- location = annexLocation r backend key
+ location = annexLocation r key