Lubuntu/ubuntu-dev-tools
3
0
Fork 0
mirror of https://git.launchpad.net/ubuntu-dev-tools synced 2025-03-13 08:01:09 +00:00
Code Issues Packages Projects Releases Wiki Activity

misc: handle ConnectionError as NotFoundError

Browse Source
This commit is contained in:
Dan Streetman 2021-09-16 20:29:14 -04:00
parent a3ff68be5a
commit 5fcc4b5b46
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
ubuntutools/misc.py
View File

@ -333,10 +333,15 @@ def download(src, dst, size=0):
with requests.get(src, stream=True, auth=auth) as fsrc, tmpdst.open('wb') as fdst: with requests.get(src, stream=True, auth=auth) as fsrc, tmpdst.open('wb') as fdst:
fsrc.raise_for_status() fsrc.raise_for_status()
_download(fsrc, fdst, size) _download(fsrc, fdst, size)
except requests.RequestException as e: except requests.exceptions.HTTPError as e:
if e.response and e.response.status_code == 404: if e.response != None and e.response.status_code == 404:
raise NotFoundError(f'URL {src} not found') from e raise NotFoundError(f'URL {src} not found: {e}')
raise DownloadError(f'Could not download {src} to {dst}') from e raise DownloadError(e)
except requests.exceptions.ConnectionError as e:
# This is most likely a archive hostname that doesn't resolve, like 'ftpmaster.internal'
raise NotFoundError(f'URL {src} not found: {e}')
except requests.exceptions.RequestException as e:
raise DownloadError(e)
shutil.move(tmpdst, dst) shutil.move(tmpdst, dst)