Merge lp:~barry/software-properties/lp1510558 into lp:software-properties

[Barry Warsaw]

Handles a failure mode we saw in promotion from xenial-proposed. Shortcut exceptions should allow other shortcuts a chance.

[Brian Murray (brian-murray)]

Looks good, thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2015-10-26 17:10:51 +0000
+++ debian/changelog	2015-10-27 14:44:37 +0000
@@ -1,3 +1,11 @@
+software-properties (0.96.15) UNRELEASED; urgency=medium
+
+  * In ppa.py, shortcut_handler(), if a ShortcutException occurs, print
+    the traceback to stderr and return None to allow other shortcut
+    handlers to run.  (LP: #1510558)
+
+ -- Barry Warsaw <[e-mail]>  Tue, 27 Oct 2015 10:17:53 -0400
+
 software-properties (0.96.14) xenial; urgency=medium
 
   * If a driver package depends on dkms and the correct linux meta package is

=== modified file 'softwareproperties/ppa.py'
--- softwareproperties/ppa.py	2015-10-13 18:30:57 +0000
+++ softwareproperties/ppa.py	2015-10-27 14:44:37 +0000
@@ -31,6 +31,7 @@
 
 from gettext import gettext as _
 from threading import Thread
+from traceback import print_exc
 
 from softwareproperties.shortcuts import ShortcutException
 
@@ -388,7 +389,11 @@
 def shortcut_handler(shortcut):
     if not shortcut.startswith("ppa:"):
         return None
-    return PPAShortcutHandler(shortcut)
+    try:
+        return PPAShortcutHandler(shortcut)
+    except ShortcutException:
+        print_exc()
+        return None
 
 
 if __name__ == "__main__":

=== modified file 'tests/test_shortcuts.py'
--- tests/test_shortcuts.py	2014-09-24 09:50:37 +0000
+++ tests/test_shortcuts.py	2015-10-27 14:44:37 +0000
@@ -7,7 +7,8 @@
 sys.path.insert(0, "..")
 
 from softwareproperties.SoftwareProperties import shortcut_handler
-
+from softwareproperties.ppa import HTTPError
+from mock import patch
 
 
 class ShortcutsTestcase(unittest.TestCase):
@@ -41,6 +42,13 @@
              '/etc/apt/sources.list.d/cloudarchive-folsom.list'),
             handler.expand("precise", distro="ubuntu"))
 
+    def test_shortcut_exception(self):
+        with patch('softwareproperties.ppa.get_ppa_info_from_lp',
+                   side_effect=HTTPError):
+            with patch('softwareproperties.ppa.print_exc') as mock:
+                shortcut_handler("ppa:mvo")
+        self.assertTrue(mock.called)
+
 
 if __name__ == "__main__":
     unittest.main()