From bf7a816f2e36e575b3325c95ef698a4923baa5be Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Wed, 17 Dec 2014 15:37:13 -0400 Subject: remove default untrusted hack for bittorrent This is better handled by checkPresent always failing. --- Remote/BitTorrent.hs | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) (limited to 'Remote') 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 -- cgit v1.2.3