Lubuntu/livecd-rootfs
3
0
Fork 0
mirror of https://git.launchpad.net/livecd-rootfs synced 2025-02-22 19:01:30 +00:00
Code Issues Packages Projects Releases Wiki Activity

magic-proxy: fix exception handling for URLError (LP: #1946520)

Browse Source
This commit is contained in:
Brian Murray 2021-11-18 15:42:44 -08:00
parent 3592e1d5e3
commit fd6b62637b
2 changed files with 11 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
debian/changelog vendored
View File

@ -1,3 +1,10 @@
livecd-rootfs (2.664.35) UNRELEASED; urgency=medium
[ Thomas Bechtold ]
* magic-proxy: fix exception handling for URLError (LP: #1946520)
-- Brian Murray <brian@ubuntu.com> Thu, 18 Nov 2021 15:41:40 -0800
livecd-rootfs (2.664.34) focal; urgency=medium
* Add the capability to build an ISO image for the Intel IoT project.

6
magic-proxy
View File

@ -883,8 +883,10 @@ class ProxyingHTTPRequestHandler(http.server.BaseHTTPRequestHandler):
self.__send_response(e)
except urllib.error.URLError as e:
self.log_message(
"urlopen() failed for {} with {}".format(uri, e.reason))
self.send_error(501, e.reason)
"urlopen() failed for {} with {}".format(uri, str(e.reason)))
# URLError.reason can either be a string or another Exception
# So do convert it to a string before sending the error (LP: #1946520)
self.send_error(501, str(e.reason))
def __get_host_path(self):