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

fix to build w/o servant

Browse source
This commit is contained in:
Joey Hess 2024-11-20 16:29:43 -04:00
parent 0083ccc677
commit 475823c2d3
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
P2P/Http/Client.hs
View file

@ -24,8 +24,8 @@ import P2P.Protocol hiding (Offset, Bypass, auth, FileSize)
import Utility.Metered
import Utility.FileSize
import Types.NumCopies
import Annex.Common
import qualified Git
#ifdef WITH_SERVANT
import qualified Annex
import Annex.UUID
@ -37,7 +37,6 @@ import Annex.Concurrent
import Utility.Url (BasicAuth(..))
import Utility.HumanTime
import Utility.STM
import qualified Git
import qualified Git.Credential as Git
import Servant hiding (BasicAuthData(..))
@ -175,7 +174,7 @@ p2pHttpClientVersions' allowedversion rmt rmtrepo fallback clientaction =
M.insert (Git.CredentialBaseURL credentialbaseurl) cred cc
Nothing -> noop
#else
p2pHttpClientVersions _ _ _ fallback () = Just <$> 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."
#endif