Sorry about the delay; I'm attaching a version that closely resembles the final version of the software-properties code.
Sorry about the delay; I'm attaching a version that closely resembles the final version of the software-properties code.