From 5c4125e55b40ff4be98a827298f4173f4e54b41e Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Thu, 1 Oct 2015 13:47:54 -0400 Subject: 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.. --- Remote/S3.hs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Remote/S3.hs') 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 -- cgit v1.2.3