mirrors/git-annex
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions

more fixes to build w/o servant

Browse source
This commit is contained in:
Joey Hess 2024-07-30 12:39:17 -04:00
parent 456ec9ccf2
commit 76f31d59b0
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
P2P/Http/Client.hs
View file

@ -24,6 +24,7 @@ import Utility.Metered
import Utility.FileSize import Utility.FileSize
import Types.NumCopies import Types.NumCopies
import Annex.Common
#ifdef WITH_SERVANT #ifdef WITH_SERVANT
import qualified Annex import qualified Annex
import Annex.UUID import Annex.UUID
@ -31,7 +32,6 @@ import Annex.Url
import Types.Remote import Types.Remote
import P2P.Http import P2P.Http
import P2P.Http.Url import P2P.Http.Url
import Annex.Common
import Annex.Concurrent import Annex.Concurrent
import Utility.Url (BasicAuth(..)) import Utility.Url (BasicAuth(..))
import Utility.HumanTime import Utility.HumanTime
@ -45,12 +45,12 @@ import Network.HTTP.Client
import qualified Data.ByteString as B import qualified Data.ByteString as B
import qualified Data.ByteString.Lazy.Internal as LI import qualified Data.ByteString.Lazy.Internal as LI
import qualified Data.Map as M import qualified Data.Map as M
import Data.Time.Clock.POSIX
import Control.Concurrent.STM import Control.Concurrent.STM
import Control.Concurrent.Async import Control.Concurrent.Async
import Control.Concurrent import Control.Concurrent
import System.IO.Unsafe import System.IO.Unsafe
#endif #endif
import Data.Time.Clock.POSIX
import qualified Data.ByteString.Lazy as L import qualified Data.ByteString.Lazy as L
type ClientAction a type ClientAction a
@ -156,7 +156,7 @@ p2pHttpClientVersions allowedversion rmt fallback clientaction =
M.insert (Git.CredentialBaseURL credentialbaseurl) cred cc M.insert (Git.CredentialBaseURL credentialbaseurl) cred cc
Nothing -> noop Nothing -> noop
#else #else
p2pHttpClientVersions _ _ fallback () = fallback p2pHttpClientVersions _ _ fallback () = Just <$> fallback
"This remote uses an annex+http url, but this version of git-annex is not built with support for that." "This remote uses an annex+http url, but this version of git-annex is not built with support for that."
#endif #endif