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

add missing case

Browse source 
and fix name shadowing warning
This commit is contained in:
Joey Hess 2019-06-04 11:24:32 -04:00
parent 418e842d93
commit fe49747fc8
No known key found for this signature in database
GPG key ID: DB12DB0FF05F8F38
1 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
Utility/Url.hs
View file

@ -287,8 +287,8 @@ getUrlInfo url uo = case parseURIRelaxed url of
_ | isftp && isJust len -> good _ | isftp && isJust len -> good
_ -> return dne _ -> return dne
existscurlrestricted r u url defport = existscurl u existscurlrestricted r u url' defport = existscurl u
=<< curlRestrictedParams r u defport (basecurlparams url) =<< curlRestrictedParams r u defport (basecurlparams url')
existsfile u = do existsfile u = do
let f = unEscapeString (uriPath u) let f = unEscapeString (uriPath u)
@ -314,6 +314,7 @@ getUrlInfo url uo = case parseURIRelaxed url of
existscurlrestricted r u' url' ftpport existscurlrestricted r u' url' ftpport
_ -> return dne _ -> return dne
Nothing -> return dne Nothing -> return dne
followredir _ _ = return dne
-- Parse eg: attachment; filename="fname.ext" -- Parse eg: attachment; filename="fname.ext"
-- per RFC 2616 -- per RFC 2616
@ -492,6 +493,7 @@ download' noerror meterupdate url file uo =
downloadcurlrestricted r u' url' ftpport downloadcurlrestricted r u' url' ftpport
_ -> throwIO ex _ -> throwIO ex
Nothing -> throwIO ex Nothing -> throwIO ex
followredir _ ex = throwIO ex
{- Sinks a Response's body to a file. The file can either be opened in {- Sinks a Response's body to a file. The file can either be opened in
- WriteMode or AppendMode. Updates the meter as data is received. - WriteMode or AppendMode. Updates the meter as data is received.