mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

Merge branch 'master' into concurrentprogress

Browse source 
Conflicts:
	debian/changelog
This commit is contained in:
Joey Hess 2015-04-14 15:35:15 -04:00
commit 86a2f9dc4d
60 changed files with 657 additions and 78 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/BitTorrent.hs
View file

@ -212,7 +212,7 @@ downloadTorrentFile u = do
downloadMagnetLink :: URLString -> FilePath -> FilePath -> Annex Bool
downloadMagnetLink u metadir dest = ifM download
( liftIO $ do
ts <- filter (".torrent" `isPrefixOf`)
ts <- filter (".torrent" `isSuffixOf`)
<$> dirContents metadir
case ts of
(t:[]) -> do