diff -Nru software-properties-0.92.37.4/debian/changelog software-properties-0.92.37.5/debian/changelog --- software-properties-0.92.37.4/debian/changelog 2015-07-07 07:54:54.000000000 +0000 +++ software-properties-0.92.37.5/debian/changelog 2015-09-02 19:30:24.000000000 +0000 @@ -1,3 +1,12 @@ +software-properties (0.92.37.5) trusty-proposed; urgency=medium + + * cloudarchive: Enable support for the Liberty Ubuntu Cloud Archive on + 14.04 (LP: #1472586). + * Revert SRU changes for "fix importing keys from path with special chars" + due to verification-failed in trusty-proposed. + + -- Corey Bryant Wed, 02 Sep 2015 12:31:11 -0400 + software-properties (0.92.37.4) trusty-proposed; urgency=medium [ Bruno Nova ] diff -Nru software-properties-0.92.37.4/softwareproperties/cloudarchive.py software-properties-0.92.37.5/softwareproperties/cloudarchive.py --- software-properties-0.92.37.4/softwareproperties/cloudarchive.py 2015-07-07 07:52:21.000000000 +0000 +++ software-properties-0.92.37.5/softwareproperties/cloudarchive.py 2015-09-02 16:33:14.000000000 +0000 @@ -35,6 +35,7 @@ 'icehouse': 'precise', 'juno': 'trusty', 'kilo': 'trusty', + 'liberty': 'trusty', } MIRROR = "http://ubuntu-cloud.archive.canonical.com/ubuntu" UCA = "Ubuntu Cloud Archive" diff -Nru software-properties-0.92.37.4/softwareproperties/SoftwareProperties.py software-properties-0.92.37.5/softwareproperties/SoftwareProperties.py --- software-properties-0.92.37.4/softwareproperties/SoftwareProperties.py 2015-07-07 07:52:41.000000000 +0000 +++ software-properties-0.92.37.5/softwareproperties/SoftwareProperties.py 2015-09-02 19:32:26.000000000 +0000 @@ -795,6 +795,8 @@ def add_key(self, path): """Add a gnupg key to the list of trusted software vendors""" + if not isinstance(path, str): + path = str(path) # allows non-ascii filenames if not os.path.exists(path): return False try: