Merge lp:~manishsinha/software-properties/list-ppa-names-for-user-or-team into lp:software-properties

[Manish Sinha (मनीष सिन्हा)]

When the PPA name is provided wrong, then via launchpadlib, it is checked if the user or team exists.
If it exists, then notify the user that PPA does not exist.

In case the user/team has a PPA, then list down the PPAs
In case the user/team does not have a PPA, show an message - "The team named 'cheers' does not have any PPA"

Note: Using people.is_team the user passed clearly marked as team or user.

=======================
Example error messages:

$ sudo ./add-apt-repository ppa:mhr3/foo
Cannot add PPA: 'ppa:mhr3/foo'.
The user named mhr3 has no PPA named foo
Please choose from the following available PPAs:
* test-ppa: Testing PPA

$ sudo ./add-apt-repository ppa:cheers/foo
Cannot add PPA: 'ppa:cheers/foo'.
The team named 'cheers' does not have any PPA

When the PPA name is provided wrong, then via launchpadlib, it is checked if the user or team exists.
If it exists, then notify the user that PPA does not exist.

In case the user/team has a PPA, then list down the PPAs
In case the user/team does not have a PPA, show an message - "The team named 'cheers' does not have any PPA"

Note: Using people.is_team the user passed clearly marked as team or user.

=======================
Example error messages:

$ sudo ./add-apt-repository ppa:mhr3/foo
Cannot add PPA: 'ppa:mhr3/foo'.
The user named mhr3 has no PPA named foo
Please choose from the following available PPAs:
* test-ppa: Testing PPA

$ sudo ./add-apt-repository ppa:cheers/foo
Cannot add PPA: 'ppa:cheers/foo'.
The team named 'cheers' does not have any PPA

[Michael Vogt (mvo)]

I think this is fine, I just would like to move the code into its own function for easier readability/testability.

[Daniel Holbach (dholbach)]

Marking as 'needs fixing', based on the above comment.

review: Needs Fixing

[Manish Sinha (मनीष सिन्हा) (manishsinha)]

@Daniel
MIchael has said that he will fix it himself (since right now I don't have a working internet connection at home and most ports blocked at my workplace)

=== modified file 'add-apt-repository'
--- add-apt-repository	2011-11-08 14:51:16 +0000
+++ add-apt-repository	2011-11-08 20:10:29 +0000
@@ -7,6 +7,7 @@
 
 from softwareproperties.SoftwareProperties import SoftwareProperties
 from softwareproperties.ppa import DEFAULT_KEYSERVER, expand_ppa_line
+from softwareproperties import lp_application_name
 from aptsources.sourceslist import SourceEntry
 from optparse import OptionParser
 from gettext import gettext as _
@@ -90,9 +91,30 @@
             ppa_info = get_ppa_info_from_lp(user, ppa_name)
         except HTTPError:
             print _("Cannot add PPA: '%s'.") % line
-            print _("Please check that the PPA name or format is correct.")
             if user.startswith("~"):
                 print _("Did you mean 'ppa:%s/%s' ?" %(user[1:], ppa_name))
+                sys.exit(1) # Exit because the user cannot be correct
+            # If the PPA does not exist, then try to find if the user/team 
+            # exists. If it exists, list down the PPAs
+            try:
+                from launchpadlib.launchpad import Launchpad
+                lp = Launchpad.login_anonymously(lp_application_name, "production")
+                try:
+                    user_inst = lp.people[user]
+                    entity_name = "team" if user_inst.is_team else "user"
+                    if len(user_inst.ppas) > 0:
+                        print _("The %s named '%s' has no PPA named '%s'" 
+                            %(entity_name, user, ppa_name))
+                        print _("Please choose from the following available PPAs:")
+                        for ppa in user_inst.ppas:
+                            print _("* %s:  %s" %(ppa.name, ppa.displayname))
+                    else:
+                        print _("The %s named '%s' does not have any PPA"
+                            %(entity_name, user))
+                except KeyError:
+                    pass
+            except ImportError:
+                print _("Please check that the PPA name or format is correct.")
             sys.exit(1)
         if options.remove:
             print _("You are about to remove the following PPA from your system:")

=== modified file 'softwareproperties/__init__.py'
--- softwareproperties/__init__.py	2011-07-18 14:52:00 +0000
+++ softwareproperties/__init__.py	2011-11-08 20:10:29 +0000
@@ -36,3 +36,4 @@
     "max_age"      : "APT::Archives::MaxAge"
 }
 
+lp_application_name = "software-properties"