summaryrefslogtreecommitdiff
path: root/Annex/Content.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-09-07 15:53:34 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-09-07 15:53:34 -0400
commita39d0a51b48a02afd7a9cd50725b753d96e9e145 (patch)
tree33909c5a6920d1ac0ab7aa22452a7d15e3338f9f /Annex/Content.hs
parentd928368d8a698abcaa06b4ee17764f5514521ffc (diff)
parent6b62556049481d8ed9b75a1642f3422a79c55133 (diff)
Merge branch 'export'
Diffstat (limited to 'Annex/Content.hs')
-rw-r--r--Annex/Content.hs8
1 files changed, 6 insertions, 2 deletions
diff --git a/Annex/Content.hs b/Annex/Content.hs
index 0001e8ac9..0b665d4dc 100644
--- a/Annex/Content.hs
+++ b/Annex/Content.hs
@@ -354,8 +354,12 @@ shouldVerify :: VerifyConfig -> Annex Bool
shouldVerify AlwaysVerify = return True
shouldVerify NoVerify = return False
shouldVerify DefaultVerify = annexVerify <$> Annex.getGitConfig
-shouldVerify (RemoteVerify r) = shouldVerify DefaultVerify
- <&&> pure (remoteAnnexVerify (Types.Remote.gitconfig r))
+shouldVerify (RemoteVerify r) =
+ (shouldVerify DefaultVerify
+ <&&> pure (remoteAnnexVerify (Types.Remote.gitconfig r)))
+ -- Export remotes are not key/value stores, so always verify
+ -- content from them even when verification is disabled.
+ <||> Types.Remote.isExportSupported r
{- Checks if there is enough free disk space to download a key
- to its temp file.