diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2014-12-17 15:37:13 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2014-12-17 15:38:00 -0400 |
| commit | bf7a816f2e36e575b3325c95ef698a4923baa5be (patch) | |
| tree | 69b1c9e890cea8025f507ce1df8caa520805b875 | |
| parent | 590ce84fb3c20a2ddebcd72308aee004107589f0 (diff) | |
remove default untrusted hack for bittorrent
This is better handled by checkPresent always failing.
| -rw-r--r-- | Remote/BitTorrent.hs | 8 | ||||
| -rw-r--r-- | doc/special_remotes/bittorrent.mdwn | 3 |
2 files changed, 1 insertions, 10 deletions
diff --git a/Remote/BitTorrent.hs b/Remote/BitTorrent.hs index 082fa9394..4cb579f15 100644 --- a/Remote/BitTorrent.hs +++ b/Remote/BitTorrent.hs @@ -72,8 +72,7 @@ gen r _ c gc = } downloadKey :: Key -> AssociatedFile -> FilePath -> MeterUpdate -> Annex Bool -downloadKey key _file dest p = do - defaultUnTrusted +downloadKey key _file dest p = get . map (torrentUrlNum . fst . getDownloader) =<< getBitTorrentUrls key where get [] = do @@ -109,11 +108,6 @@ dropKey k = do checkKey :: Key -> Annex Bool checkKey key = error "cannot reliably check torrent status" --- Makes this remote UnTrusted, unless it already has a trust set. -defaultUnTrusted :: Annex () -defaultUnTrusted = whenM (isNothing . M.lookup bitTorrentUUID <$> trustMapRaw) $ - trustSet bitTorrentUUID UnTrusted - getBitTorrentUrls :: Key -> Annex [URLString] getBitTorrentUrls key = filter supported <$> getUrls key where diff --git a/doc/special_remotes/bittorrent.mdwn b/doc/special_remotes/bittorrent.mdwn index 7fe8ebde8..36fa1b879 100644 --- a/doc/special_remotes/bittorrent.mdwn +++ b/doc/special_remotes/bittorrent.mdwn @@ -16,8 +16,5 @@ bittornado or the original BitTorrent client. Currently git-annex only supports downloading content from a torrent; it cannot upload or remove content. -Torrent swarms tend to come and go, so git-annex defaults to *not* -trusting the bittorrent special remote. - Multi-file torrents are supported; to handle them, `git annex addurl` will add a directory containing all the files from the torrent. |