Merge ~ddstreet/software-properties:lp1965180 into software-properties:ubuntu/master

[Dan Streetman]

diff --git a/softwareproperties/ppa.py b/softwareproperties/ppa.py
index 0e1bff1..eb4f371 100644
--- a/softwareproperties/ppa.py
+++ b/softwareproperties/ppa.py
@@ -56,6 +56,8 @@ class PPAShortcutHandler(ShortcutHandler):
         self._lpteam = None                 # Person/Team LP object
         self._lpppa = None                  # PPA Archive LP object
 
+        self._is_sourceslist = False
+
         # one of these will set teamname and ppaname, and maybe _source_entry
         if not any((self._match_ppa(shortcut),
                     self._match_uri(shortcut),
@@ -66,6 +68,13 @@ class PPAShortcutHandler(ShortcutHandler):
         self._filebase = "%s-ubuntu-%s" % (self.teamname, self.ppaname)
         self._set_auth()
 
+        # Make sure we can find/access the PPA, lp:#1965180
+        if self._is_sourceslist:
+            try:
+                self.lpppa
+            except ShortcutException:
+                raise InvalidShortcutException(_("ERROR: Can't find ppa"))
+
         if not self._source_entry:
             comps = self.components
             if not comps:
@@ -190,9 +199,11 @@ class PPAShortcutHandler(ShortcutHandler):
 
     def _match_sourceslist(self, shortcut):
         try:
-            return self._match_handler(SourcesListShortcutHandler(shortcut))
+            handler = self._match_handler(SourcesListShortcutHandler(shortcut))
         except InvalidShortcutException:
             return False
+        self._is_sourceslist = True
+        return handler
 
     def _match_handler(self, handler):
         parsed = urlparse(handler.SourceEntry().uri)