aboutsummaryrefslogtreecommitdiff
path: root/Backend
diff options
context:
space:
mode:
authorGravatar Joey Hess <joey@kitenet.net>2013-12-04 13:13:30 -0400
committerGravatar Joey Hess <joey@kitenet.net>2013-12-04 13:13:30 -0400
commit7edfb1651619db820470d2ea5ddde8fef57df67d (patch)
tree3f94fd1997bcb0a278eb6b934c82ab7a0d75b1e6 /Backend
parent081cd6fc5622d5e6d28eafbe91b5950328bb1844 (diff)
import: Add --skip-duplicates option.
Note that the hash backends were made to stop printing a (checksum..) message as part of this, since it showed up without a file when deciding whether to act on a file. Should have probably removed that message a while ago anyway, I suppose.
Diffstat (limited to 'Backend')
-rw-r--r--Backend/Hash.hs4
1 files changed, 1 insertions, 3 deletions
diff --git a/Backend/Hash.hs b/Backend/Hash.hs
index 96a9bab3c..d46ce973e 100644
--- a/Backend/Hash.hs
+++ b/Backend/Hash.hs
@@ -129,9 +129,7 @@ needsUpgrade key = "\\" `isPrefixOf` keyHash key ||
any (not . validExtension) (takeExtensions $ keyName key)
hashFile :: Hash -> FilePath -> Integer -> Annex String
-hashFile hash file filesize = do
- showAction "checksum"
- liftIO $ go hash
+hashFile hash file filesize = liftIO $ go hash
where
go (SHAHash hashsize) = case shaHasher hashsize filesize of
Left sha -> sha <$> L.readFile file