Merge branch 'master' into import-from-s3
This commit is contained in:
commit
700a3f2787
29 changed files with 426 additions and 43 deletions
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue