diff options
| author |  Joey Hess <joey@kitenet.net> | 2012-09-21 14:50:14 -0400 |
|---|---|---|
| committer | Joey Hess <joey@kitenet.net> | 2012-09-21 14:50:14 -0400 |
| commit | 226781c047a50747f5c60a6cf4920a43cd3a3a73 (patch) | |
| tree | 0a5ead6c80110d533630db1875a9ebc10dea176d /Remote/S3.hs | |
| parent | 6873d785f050cbfb2aa7bd67fcdb29ab585ec291 (diff) | |
unify types
Diffstat (limited to 'Remote/S3.hs')
| -rw-r--r-- | Remote/S3.hs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 12eb96add..65346809e 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -115,14 +115,14 @@ s3Setup u c = handlehost $ M.lookup "host" c -- be human-readable M.delete "bucket" defaults -store :: Remote -> Key -> AssociatedFile -> ProgressCallback -> Annex Bool -store r k _f p = s3Action r False $ \(conn, bucket) -> do +store :: Remote -> Key -> AssociatedFile -> MeterUpdate -> Annex Bool +store r k _f _p = s3Action r False $ \(conn, bucket) -> do dest <- inRepo $ gitAnnexLocation k res <- liftIO $ storeHelper (conn, bucket) r k dest s3Bool res -storeEncrypted :: Remote -> (Cipher, Key) -> Key -> ProgressCallback -> Annex Bool -storeEncrypted r (cipher, enck) k p = s3Action r False $ \(conn, bucket) -> +storeEncrypted :: Remote -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool +storeEncrypted r (cipher, enck) k _p = s3Action r False $ \(conn, bucket) -> -- To get file size of the encrypted content, have to use a temp file. -- (An alternative would be chunking to to a constant size.) withTmp enck $ \tmp -> do |