Merge lp:~geser/ubuntu-archive-tools/anon-login into lp:ubuntu-archive-tools

[Michael Bienia]

Add basic support for anonymous LP login for "query" and "check" (most useful to query packageset contents).

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'edit_acl.py'
--- edit_acl.py	2010-08-01 22:28:53 +0000
+++ edit_acl.py	2010-11-23 18:07:20 +0000
@@ -12,6 +12,7 @@
     os.path.dirname(__file__), 'lib'))
 
 import launchpadlib.errors
+from launchpadlib.launchpad import Launchpad
 
 import lputils
 
@@ -83,7 +84,6 @@
 
 def do_query(options):
     """Query existing permissions and show on stdout."""
-    launchpad = lputils.lpfactory(options.launchpad_instance, CONSUMER_KEY)
     if options.archive is None:
         archives = launchpad.distributions['ubuntu'].archives
     else:
@@ -209,7 +209,6 @@
     if not validate_add_delete_options(options):
         return False
 
-    launchpad = lputils.lpfactory(options.launchpad_instance, CONSUMER_KEY)
     archive = get_archive(options, launchpad)
 
     if options.packageset and options.source:
@@ -266,7 +265,6 @@
     if not validate_add_delete_options(options):
         return False
 
-    launchpad = lputils.lpfactory(options.launchpad_instance, CONSUMER_KEY)
     archive = get_archive(options, launchpad)
 
     if options.packageset and options.source:
@@ -323,7 +321,6 @@
         print "You can only create a package set, not something else."
         return False
 
-    launchpad = lputils.lpfactory(options.launchpad_instance, CONSUMER_KEY)
     if len(options.person) != 1:
         print "You must specify exactly one person to own the new package set."
     lp_person = launchpad.people[options.person[0]]
@@ -350,7 +347,6 @@
         print "A source package needs to be specified to check."
         return False
 
-    launchpad = lputils.lpfactory(options.launchpad_instance, CONSUMER_KEY)
     archive = get_archive(options, launchpad)
     people = [launchpad.people[person] for person in options.person]
 
@@ -421,6 +417,8 @@
     parser.add_option("-s", "--source", dest="source", action="append")
     parser.add_option("-t", "--acl-type", dest="acl_type",
                       help="ACL type: upload or admin")
+    parser.add_option("--anon", dest="anon_login", action="store_true",
+            default=False, help="Login anonymously to Launchpad")
 
     options, args = parser.parse_args()
 
@@ -431,6 +429,10 @@
             "You must specify an action, one of:\n%s"
                 % ", ".join(possible_actions))
 
+    if options.anon_login and args[0] not in ('query', 'check'):
+        print "E: Anonymous login not supported for this action."
+        sys.exit(1)
+
     if (not options.person and not options.component and
         not options.packageset and not options.source):
         parser.error("Provide at least one of "
@@ -445,6 +447,11 @@
     if options.acl_type == 'admin' and options.source:
         parser.error("ACL type admin not allowed for source packages")
 
+    if options.anon_login:
+        launchpad = Launchpad.login_anonymously(CONSUMER_KEY, options.launchpad_instance)
+    else:
+        launchpad = lputils.lpfactory(options.launchpad_instance, CONSUMER_KEY)
+
     try:
         main(options, args[0])
     except launchpadlib.errors.HTTPError, err: