aboutsummaryrefslogtreecommitdiff
path: root/Remote/P2P.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2017-09-07 13:45:31 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2017-09-07 13:48:44 -0400
commitd910a94df7d6f5c87897c248586cb65523457f99 (patch)
tree692446ec624e63ac8fa4aec72f0b5ee8e5d13723 /Remote/P2P.hs
parent7bd9a9cad8b413f4b09f9ab11a9d6d7ce72b8336 (diff)
prevent exporttree=yes on remotes that don't support exports
Don't allow "exporttree=yes" to be set when the special remote does not support exports. That would be confusing since the user would set up a special remote for exports, but `git annex export` to it would later fail. This commit was supported by the NSF-funded DataLad project.
Diffstat (limited to 'Remote/P2P.hs')
-rw-r--r--Remote/P2P.hs13
1 files changed, 7 insertions, 6 deletions
diff --git a/Remote/P2P.hs b/Remote/P2P.hs
index f51b73b33..be0d4589f 100644
--- a/Remote/P2P.hs
+++ b/Remote/P2P.hs
@@ -34,14 +34,15 @@ import Control.Concurrent
import Control.Concurrent.STM
remote :: RemoteType
-remote = RemoteType {
- typename = "p2p",
+remote = RemoteType
+ { typename = "p2p"
-- Remote.Git takes care of enumerating P2P remotes,
-- and will call chainGen on them.
- enumerate = const (return []),
- generate = \_ _ _ _ -> return Nothing,
- setup = error "P2P remotes are set up using git-annex p2p"
-}
+ , enumerate = const (return [])
+ , generate = \_ _ _ _ -> return Nothing
+ , setup = error "P2P remotes are set up using git-annex p2p"
+ , exportSupported = exportUnsupported
+ }
chainGen :: P2PAddress -> Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote)
chainGen addr r u c gc = do