[Merge] ~slingamn/software-properties:norequests_redux into software-properties:ubuntu/master

[Shivaram Lingamneni]

Shivaram Lingamneni has proposed merging ~slingamn/software-properties:norequests_redux into software-properties:ubuntu/master.

Requested reviews:
  Dan Streetman (ddstreet)

For more details, see:
https://code.launchpad.net/~slingamn/software-properties/+git/software-properties/+merge/396880

This is a follow-up to https://code.launchpad.net/%7Eslingamn/software-properties/+git/software-properties/+merge/389182 . It derives from Canonical-owned code instead of from an Apache-licensed third-party project.

As far as I can tell, the change from the earlier review was not actually reverted, so this just adds an additional commit on top.

I've tested this in an Ubuntu 20.04 VM (some minor backporting was necessary, but it was orthogonal to the change).

Thanks for your time!
-- 
Your team Ubuntu Core Development Team is subscribed to branch software-properties:ubuntu/master.
-------------- next part --------------
A non-text attachment was scrubbed...
Name: review-diff.txt
Type: text/x-diff
Size: 2405 bytes
Desc: not available
URL: <https://lists.ubuntu.com/archives/ubuntu-reviews/attachments/20210126/767afda0/attachment.diff>