summaryrefslogtreecommitdiff
path: root/Backend
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2011-06-22 16:13:43 -0400
committerGravatar Joey Hess <joey@kitenet.net>2011-06-22 16:17:16 -0400
commit1870186632e3d4f99e9b87f71f0ddea83ad04568 (patch)
tree2abd0484a9a729c8ec79997e25d5d5d92e0bdf3b /Backend
parente0bd9d43a21bae8193cb0a56be2246ee8cdafdaa (diff)
fixed logFile
Diffstat (limited to 'Backend')
-rw-r--r--Backend/File.hs5
1 files changed, 2 insertions, 3 deletions
diff --git a/Backend/File.hs b/Backend/File.hs
index 20cb3e95a..eab987ef8 100644
--- a/Backend/File.hs
+++ b/Backend/File.hs
@@ -131,7 +131,7 @@ showLocations :: Key -> [UUID] -> Annex ()
showLocations key exclude = do
g <- Annex.gitRepo
u <- getUUID g
- uuids <- keyLocations g key
+ uuids <- keyLocations key
untrusteduuids <- trustGet UnTrusted
let uuidswanted = filteruuids uuids (u:exclude++untrusteduuids)
let uuidsskipped = filteruuids uuids (u:exclude++uuidswanted)
@@ -188,8 +188,7 @@ checkKeyOnly = checkKey (\_ -> return True)
checkKeyNumCopies :: Key -> Maybe FilePath -> Maybe Int -> Annex Bool
checkKeyNumCopies key file numcopies = do
needed <- getNumCopies numcopies
- g <- Annex.gitRepo
- locations <- keyLocations g key
+ locations <- keyLocations key
untrusted <- trustGet UnTrusted
let untrustedlocations = intersect untrusted locations
let safelocations = filter (`notElem` untrusted) locations