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

fix build warnings

Browse source
This commit is contained in:
Joey Hess 2023-06-21 13:06:11 -04:00
parent 2b2ec8fa63
commit 6e059b42da
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

9
Remote/HttpAlso.hs
View file

@ -20,7 +20,6 @@ import Config.Cost
import Config import Config
import Logs.Web import Logs.Web
import Creds import Creds
import Messages.Progress
import Utility.Metered import Utility.Metered
import Annex.Verify import Annex.Verify
import qualified Annex.Url as Url import qualified Annex.Url as Url
@ -123,15 +122,15 @@ httpAlsoSetup _ (Just u) _ c gc = do
downloadKey :: Maybe URLString -> LearnedLayout -> Retriever downloadKey :: Maybe URLString -> LearnedLayout -> Retriever
downloadKey baseurl ll = fileRetriever' $ \dest key p iv -> downloadKey baseurl ll = fileRetriever' $ \dest key p iv ->
downloadAction (fromRawFilePath dest) p iv key (keyUrlAction baseurl ll key) downloadAction (fromRawFilePath dest) p iv (keyUrlAction baseurl ll key)
retriveExportHttpAlso :: Maybe URLString -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex Verification retriveExportHttpAlso :: Maybe URLString -> Key -> ExportLocation -> FilePath -> MeterUpdate -> Annex Verification
retriveExportHttpAlso baseurl key loc dest p = do retriveExportHttpAlso baseurl key loc dest p = do
verifyKeyContentIncrementally AlwaysVerify key $ \iv -> verifyKeyContentIncrementally AlwaysVerify key $ \iv ->
downloadAction dest p iv key (exportLocationUrlAction baseurl loc) downloadAction dest p iv (exportLocationUrlAction baseurl loc)
downloadAction :: FilePath -> MeterUpdate -> Maybe IncrementalVerifier -> Key -> ((URLString -> Annex (Either String ())) -> Annex (Either String ())) -> Annex () downloadAction :: FilePath -> MeterUpdate -> Maybe IncrementalVerifier -> ((URLString -> Annex (Either String ())) -> Annex (Either String ())) -> Annex ()
downloadAction dest p iv key run = downloadAction dest p iv run =
Url.withUrlOptions $ \uo -> Url.withUrlOptions $ \uo ->
run (\url -> Url.download' p iv url dest uo) run (\url -> Url.download' p iv url dest uo)
>>= either giveup (const (return ())) >>= either giveup (const (return ()))