summaryrefslogtreecommitdiff
path: root/Remote/S3.hs
diff options
context:
space:
mode:
authorGravatar Joey Hess <joeyh@joeyh.name>2015-11-16 21:00:54 -0400
committerGravatar Joey Hess <joeyh@joeyh.name>2015-11-16 21:00:54 -0400
commit89e8441c62b985a6bcf37024fc051e99fbce8e37 (patch)
treeef9d04b7f73633a27c187b472efc5142fde62130 /Remote/S3.hs
parentd77b7936adc49a98172a16a3fea89fb2ad9fd642 (diff)
Display progress meter in -J mode when downloading from the web.
Including in addurl, and get --from web, but also in S3 and External special remotes when a web url is known for content in those remotes.
Diffstat (limited to 'Remote/S3.hs')
-rw-r--r--Remote/S3.hs4
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs
index fb772825c..ba30bffeb 100644
--- a/Remote/S3.hs
+++ b/Remote/S3.hs
@@ -249,8 +249,8 @@ retrieve r info Nothing = case getpublicurl info of
Nothing -> \_ _ _ -> do
warnMissingCredPairFor "S3" (AWS.creds $ uuid r)
return False
- Just geturl -> fileRetriever $ \f k _p ->
- unlessM (downloadUrl [geturl k] f) $
+ Just geturl -> fileRetriever $ \f k p ->
+ unlessM (downloadUrl k p [geturl k] f) $
error "failed to download content"
retrieveCheap :: Key -> AssociatedFile -> FilePath -> Annex Bool