From 0f9282d22dc773bd57f3482b79dd976316ec0467 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Mon, 4 Sep 2017 16:39:56 -0400 Subject: git annex get from exports Straightforward enough, except for the needed belt-and-suspenders sanity checks to avoid foot shooting due to exports not being key/value stores. * Even when annex.verify=false, always verify from exports. * Only get files from exports that use a backend that supports checksum verification. * Never trust exports, even if the user says to, because then `git annex drop` would drop content if the export seemed to contain a copy. This commit was supported by the NSF-funded DataLad project. --- Types/Remote.hs | 2 +- Types/TrustLevel.hs | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'Types') diff --git a/Types/Remote.hs b/Types/Remote.hs index 81f1dbe23..46750ee8d 100644 --- a/Types/Remote.hs +++ b/Types/Remote.hs @@ -159,7 +159,7 @@ unVerified a = do -- The FilePath will be relative, and may contain unix-style path -- separators. newtype ExportLocation = ExportLocation FilePath - deriving (Eq) + deriving (Show, Eq) data ExportActions a = ExportActions { exportSupported :: a Bool diff --git a/Types/TrustLevel.hs b/Types/TrustLevel.hs index 1cc4c662e..6ec18e512 100644 --- a/Types/TrustLevel.hs +++ b/Types/TrustLevel.hs @@ -21,7 +21,7 @@ import Types.UUID -- This order may seem backwards, but we generally want to list dead -- remotes last and trusted ones first. data TrustLevel = Trusted | SemiTrusted | UnTrusted | DeadTrusted - deriving (Eq, Enum, Ord, Bounded) + deriving (Eq, Enum, Ord, Bounded, Show) instance Default TrustLevel where def = SemiTrusted -- cgit v1.2.3