summaryrefslogtreecommitdiff
path: root/Annex/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2016-01-20 16:36:33 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2016-01-20 16:36:33 -0400
commit10c579282b4f0acc7f26d8084916f7d538a89bd8 (patch)
treebc9e4a526b3bef0cb54b784cbe0d42a555a329db /Annex/Content.hs
parentd115fb8d3418d494708390f8a74938d830c669b7 (diff)
remove 163 lines of code without changing anything except imports
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r--Annex/Content.hs7
1 files changed, 3 insertions, 4 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index fd0a2742c..103fa264d 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -52,7 +52,7 @@ module Annex.Content (
import System.IO.Unsafe (unsafeInterleaveIO)
import qualified Data.Set as S
-import Common.Annex
+import Annex.Common
import Logs.Location
import Logs.Transfer
import qualified Git
@@ -62,7 +62,6 @@ import qualified Annex.Branch
import Utility.DiskFree
import Utility.FileMode
import qualified Annex.Url as Url
-import Types.Key
import Utility.DataUnits
import Utility.CopyFile
import Utility.Metered
@@ -336,12 +335,12 @@ verifyKeyContent v Types.Remote.UnVerified k f = ifM (shouldVerify v)
, return True
)
where
- verifysize = case Types.Key.keySize k of
+ verifysize = case keySize k of
Nothing -> return True
Just size -> do
size' <- liftIO $ catchDefaultIO 0 $ getFileSize f
return (size' == size)
- verifycontent = case Types.Backend.verifyKeyContent =<< Backend.maybeLookupBackendName (Types.Key.keyBackendName k) of
+ verifycontent = case Types.Backend.verifyKeyContent =<< Backend.maybeLookupBackendName (keyBackendName k) of
Nothing -> return True
Just verifier -> verifier k f