[Merge] ~toabctl/livecd-rootfs:focal-sru-lp-1946520 into livecd-rootfs:ubuntu/focal

[Thomas Bechtold]

Thomas Bechtold has proposed merging ~toabctl/livecd-rootfs:focal-sru-lp-1946520 into livecd-rootfs:ubuntu/focal.

Commit message:
Add debian/changelog entry

magic-proxy: fix exception handling for URLError LP:#1946520
A urllib.error.URLError.reason variable can either be a string or
another Exception[0]. In case it's another exception, the current code
fails because the exception is passed into send_error() which tries
call html.escape() on the Exception. That fails because the Exception
is not a string. Converting the Exception to a string fixes this.
This fixes:
AttributeError: 'TimeoutError' object has no attribute 'replace'
[0]
https://docs.python.org/3/library/urllib.error.html#urllib.error.URLError.reason
(cherry picked from commit af888e24ff8ec478b490c6d0fc39131cd63a8079)



Requested reviews:
  Ubuntu Core Development Team (ubuntu-core-dev)
Related bugs:
  Bug #1946520 in livecd-rootfs (Ubuntu): "magic-proxy does not gracefully handle error conditions"
  https://bugs.launchpad.net/ubuntu/+source/livecd-rootfs/+bug/1946520

For more details, see:
https://code.launchpad.net/~toabctl/livecd-rootfs/+git/livecd-rootfs-1/+merge/410823
-- 
Your team Ubuntu Core Development Team is requested to review the proposed merge of ~toabctl/livecd-rootfs:focal-sru-lp-1946520 into livecd-rootfs:ubuntu/focal.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 1172 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20211026/33715607/attachment-0001.diff>