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

Merge branch 'master' into import-from-s3

Browse source
This commit is contained in:
Joey Hess 2019-05-01 14:30:52 -04:00
commit 700a3f2787
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
29 changed files with 426 additions and 43 deletions
Download patch file Download diff file Expand all files Collapse all files

2
Remote/S3.hs
View file

@ -81,7 +81,7 @@ gen r u c gc = do
cst <- remoteCost gc expensiveRemoteCost
info <- extractS3Info c
hdl <- mkS3HandleVar c gc u
magic <- liftIO initMagicMimeType
magic <- liftIO initMagicMime
return $ new cst info hdl magic
where
new cst info hdl magic = Just $ specialRemote c