fix build (seems getGpgEncOpts got renamed to getGpgEncParams)
This commit is contained in:
parent
8293ed619f
commit
1587fd42a3
3 changed files with 3 additions and 3 deletions
|
@ -155,7 +155,7 @@ readBytes a h = L.hGetContents h >>= a
|
||||||
- public-key encryption is used) using the given gpg options, and then
|
- public-key encryption is used) using the given gpg options, and then
|
||||||
- read by the Reader action. Note: For public-key encryption,
|
- read by the Reader action. Note: For public-key encryption,
|
||||||
- recipients MUST be included in 'params' (for instance using
|
- recipients MUST be included in 'params' (for instance using
|
||||||
- 'getGpgEncOpts'). -}
|
- 'getGpgEncParams'). -}
|
||||||
encrypt :: [CommandParam] -> Cipher -> Feeder -> Reader a -> IO a
|
encrypt :: [CommandParam] -> Cipher -> Feeder -> Reader a -> IO a
|
||||||
encrypt params cipher = Gpg.feedRead params' pass
|
encrypt params cipher = Gpg.feedRead params' pass
|
||||||
where
|
where
|
||||||
|
|
|
@ -129,7 +129,7 @@ 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.
|
-- To get file size of the encrypted content, have to use a temp file.
|
||||||
-- (An alternative would be chunking to to a constant size.)
|
-- (An alternative would be chunking to to a constant size.)
|
||||||
withTmp enck $ \tmp -> sendAnnex k (void $ remove' r enck) $ \src -> do
|
withTmp enck $ \tmp -> sendAnnex k (void $ remove' r enck) $ \src -> do
|
||||||
liftIO $ encrypt (getGpgEncOpts r) cipher (feedFile src) $
|
liftIO $ encrypt (getGpgEncParams r) cipher (feedFile src) $
|
||||||
readBytes $ L.writeFile tmp
|
readBytes $ L.writeFile tmp
|
||||||
s3Bool =<< storeHelper (conn, bucket) r enck p tmp
|
s3Bool =<< storeHelper (conn, bucket) r enck p tmp
|
||||||
|
|
||||||
|
|
|
@ -94,7 +94,7 @@ storeEncrypted :: Remote -> (Cipher, Key) -> Key -> MeterUpdate -> Annex Bool
|
||||||
storeEncrypted r (cipher, enck) k p = metered (Just p) k $ \meterupdate ->
|
storeEncrypted r (cipher, enck) k p = metered (Just p) k $ \meterupdate ->
|
||||||
davAction r False $ \(baseurl, user, pass) ->
|
davAction r False $ \(baseurl, user, pass) ->
|
||||||
sendAnnex k (void $ remove r enck) $ \src ->
|
sendAnnex k (void $ remove r enck) $ \src ->
|
||||||
liftIO $ encrypt (getGpgEncOpts r) cipher
|
liftIO $ encrypt (getGpgEncParams r) cipher
|
||||||
(streamMeteredFile src meterupdate) $
|
(streamMeteredFile src meterupdate) $
|
||||||
readBytes $ storeHelper r enck baseurl user pass
|
readBytes $ storeHelper r enck baseurl user pass
|
||||||
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue