summaryrefslogtreecommitdiff
path: root/Command/Reinject.hs
diff options
context:
space:
mode:
Diffstat (limited to 'Command/Reinject.hs')
-rw-r--r--Command/Reinject.hs15
1 files changed, 7 insertions, 8 deletions
diff --git a/Command/Reinject.hs b/Command/Reinject.hs
index d50db18af..0b1b0e2e2 100644
--- a/Command/Reinject.hs
+++ b/Command/Reinject.hs
@@ -38,14 +38,13 @@ perform src _dest key = ifM move
, error "failed"
)
where
- -- The file might be on a different filesystem,
- -- so moveFile is used rather than simply calling
- -- moveToObjectDir; disk space is also checked this way,
- -- and the file's content is verified to match the key.
- move = getViaTmp DefaultVerify key $ \tmp -> unVerified $
- liftIO $ catchBoolIO $ do
- moveFile src tmp
- return True
+ move = checkDiskSpaceToGet key False $
+ ifM (verifyKeyContent DefaultVerify UnVerified key src)
+ ( do
+ moveAnnex key src
+ return True
+ , return False
+ )
cleanup :: Key -> CommandCleanup
cleanup key = do