fix reversion
4af55c42bf
reordered the exception
catching, preventing following ftp redirect
This commit is contained in:
parent
f5eb28682a
commit
19defc7932
1 changed files with 2 additions and 2 deletions
|
@ -336,9 +336,9 @@ download' noerror meterupdate url file uo =
|
|||
case (urlDownloader uo, parseUrlRequest (show u)) of
|
||||
(DownloadWithConduit (DownloadWithCurlRestricted r), Just req) -> catchJust
|
||||
(matchStatusCodeException (== found302))
|
||||
((downloadConduit meterupdate req file uo >> return True)
|
||||
`catchNonAsync` (dlfailed . show))
|
||||
(downloadConduit meterupdate req file uo >> return True)
|
||||
(followredir r)
|
||||
`catchNonAsync` (dlfailed . show)
|
||||
(DownloadWithConduit (DownloadWithCurlRestricted r), Nothing)
|
||||
| isfileurl u -> downloadfile u
|
||||
| isftpurl u -> downloadcurlrestricted r u url ftpport
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue