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

Merge branch 'later'

Browse source
This commit is contained in:
Joey Hess 2018-06-25 21:59:20 -04:00
commit dc6cb6aa5f
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
7 changed files with 93 additions and 21 deletions
Download patch file Download diff file Expand all files Collapse all files

6
Remote/BitTorrent.hs
View file

@ -14,6 +14,7 @@ import Types.Remote
import qualified Annex
import qualified Git
import qualified Git.Construct
import Config
import Config.Cost
import Logs.Web
import Types.UrlContents
@ -51,10 +52,11 @@ list _autoinit = do
return [r]
gen :: Git.Repo -> UUID -> RemoteConfig -> RemoteGitConfig -> Annex (Maybe Remote)
gen r _ c gc =
gen r _ c gc = do
cst <- remoteCost gc expensiveRemoteCost
return $ Just Remote
{ uuid = bitTorrentUUID
, cost = expensiveRemoteCost
, cost = cst
, name = Git.repoDescribe r
, storeKey = uploadKey
, retrieveKeyFile = downloadKey