diff options
| author |  Joey Hess <joeyh@joeyh.name> | 2015-10-01 13:47:54 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2015-10-01 13:48:56 -0400 |
| commit | 5c4125e55b40ff4be98a827298f4173f4e54b41e (patch) | |
| tree | a336a4be3a961a403f4be961490dee24e3c5d790 /Remote | |
| parent | e3969aeb3c1d8a91a31d4da31097ab5c59436774 (diff) | |
avoid deprecation warnings when built with http-client >= 0.4.18
Since I want git-annex to keep building on debian stable, I need to still
support the old http-client, which required explicit calls to
closeManager, or use of withManager to get Managers to close at appropriate
times. This is not needed in the new version, and so they added a
deprecation warning. IMHO much too early, because look at the mess I had to
go through to avoid that deprecation warning while supporting both
versions..
Diffstat (limited to 'Remote')
| -rw-r--r-- | Remote/S3.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Remote/S3.hs b/Remote/S3.hs index 7b71df2b0..c8a34f2e7 100644 --- a/Remote/S3.hs +++ b/Remote/S3.hs @@ -21,7 +21,7 @@ import qualified Data.ByteString as S import qualified Data.Map as M import Data.Char import Network.Socket (HostName) -import Network.HTTP.Conduit (Manager, newManager, closeManager) +import Network.HTTP.Conduit (Manager, newManager) import Network.HTTP.Client (defaultManagerSettings, managerResponseTimeout, responseStatus, responseBody, RequestBody(..)) import Network.HTTP.Types import Control.Monad.Trans.Resource @@ -48,7 +48,7 @@ import Utility.Metered import Utility.DataUnits import Annex.Content import Annex.Url (withUrlOptions) -import Utility.Url (checkBoth) +import Utility.Url (checkBoth, closeManager) type BucketName = String |