=== modified file 'debian/changelog'
--- debian/changelog 2017-03-06 15:08:25 +0000
+++ debian/changelog 2017-03-06 17:20:02 +0000
@@ -1,3 +1,18 @@
+software-properties (0.96.24.11) zesty; urgency=medium
+
+ [Scott Moser]
+ * debian/tests/run-tests: use gpg rather than gpg1, and show errors
+ (LP: #1670399)
+ * debian/tests/control: add gnupg to list of dependencies.
+
+ [Ian Lane]
+ * softwareproperties/shortcuts.py: Make add_key() return True. Since r988,
+ the return value of add_key() is now used to raise an exception.
+ ShortcutHandler.add_key() always succeeds, so should return True. This
+ (LP: #1670399)
+
+ -- Scott Moser <smoser@ubuntu.com> Mon, 06 Mar 2017 12:19:59 -0500
+
software-properties (0.96.24.10) zesty; urgency=medium
* Add knowledge of OpenStack releases Pike and Queens. (LP: #1670385)
=== modified file 'debian/tests/control'
--- debian/tests/control 2016-09-01 10:23:19 +0000
+++ debian/tests/control 2017-03-06 17:19:40 +0000
@@ -1,5 +1,5 @@
Tests: run-tests
-Depends: @, xvfb, dbus-x11, python-dbus, python-pycurl, python3-pycurl, python-mock, python3-mock, python-distutils-extra, python-setuptools, python3-distutils-extra, python3-setuptools, python-gi, python3-gi, pyflakes, pyflakes3
+Depends: @, xvfb, dbus-x11, python-dbus, python-pycurl, python3-pycurl, python-mock, python3-mock, python-distutils-extra, python-setuptools, python3-distutils-extra, python3-setuptools, python-gi, python3-gi, pyflakes, pyflakes3, gnupg
Tests: add-apt-repository
Depends: software-properties-common, gnupg
=== modified file 'debian/tests/run-tests'
--- debian/tests/run-tests 2016-09-12 11:49:08 +0000
+++ debian/tests/run-tests 2017-03-06 17:19:40 +0000
@@ -14,9 +14,13 @@
export LC_ALL=C.UTF-8
# dirmngr and/or gpg-agent fail without ~/.gnupg present maybe some
-# places should be properly declaring homedir, instead of just
-# keyrings
-gpg1 -k >/dev/null 2>&1
+# places should be properly declaring homedir, instead of just keyrings
+if ! out=$(gpg --list-keys 2>&1); then
+ ret=$?
+ echo "Failed [$ret] to initialize ~/.gnupg with: gpg --list-keys" 1>&2
+ echo "$out" 1>&2;
+ exit $ret
+fi
code=0
if [ "$TMPDIR" ]; then
=== modified file 'softwareproperties/shortcuts.py'
--- softwareproperties/shortcuts.py 2014-09-24 09:50:37 +0000
+++ softwareproperties/shortcuts.py 2017-03-06 17:19:40 +0000
@@ -31,7 +31,7 @@
self.shortcut = shortcut
def add_key(self, keyserver=None):
- return None
+ return True
def expand(self, codename=None, distro=None):
return (self.shortcut, None)