Merge lp:~geser/ubuntu-archive-tools/add_check_option into lp:ubuntu-archive-tools

[Michael Bienia]

* 'debian_bundle' got renamed to 'debian'. Try importing it first before falling back to the old name.
* Also display the HTTP error code
* Add an option to edit_acl.py to check if a person has upload permissions for a package.

=== modified file 'backport.py'
--- backport.py	2010-05-09 06:18:34 +0000
+++ backport.py	2010-07-22 10:43:55 +0000
@@ -12,7 +12,10 @@
 sys.path.insert(0, os.path.join(
     os.path.dirname(__file__), 'lib'))
 
-from debian_bundle import deb822
+try:
+    from debian import deb822
+except ImportError:
+    from debian_bundle import deb822
 import apt_pkg
 
 import lputils
 
=== modified file 'edit_acl.py'
--- edit_acl.py	2010-06-29 17:35:11 +0000
+++ edit_acl.py	2010-07-22 10:43:55 +0000
@@ -52,7 +52,10 @@
 
 
 def get_source_components(options, launchpad, archive, source):
-    from debian_bundle import debian_support
+    try:
+        from debian import debian_support
+    except ImportError:
+        from debian_bundle import debian_support
 
     args = {}
     if options.series:
@@ -337,6 +340,55 @@
         print ps
 
 
+def do_check(options):
+    """Check if a person can upload a package."""
+    if not options.person:
+        print "A person needs to be specified to check."
+        return False
+    if not options.source:
+        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]
+
+    if options.series:
+        distro_series = launchpad.distributions['ubuntu'].getSeries(
+                name_or_version=options.series)
+    else:
+        distro_series = launchpad.distributions['ubuntu'].getDevelopmentSeries()[0]
+
+    for person in people:
+        for srcpkg in options.source:
+            spph = archive.getPublishedSources(
+                    distro_series=distro_series,
+                    exact_match=True,
+                    pocket='Release',
+                    source_name=srcpkg,
+                    status='Published',
+                    )[0]
+            try:
+                archive.checkUpload(
+                        component=spph.component_name,
+                        distroseries=distro_series,
+                        person=person,
+                        pocket='Release',
+                        sourcepackagename=srcpkg,
+                        )
+                print "%s (%s) can upload %s to %s" % (
+                        person.display_name, person.name,
+                        srcpkg, distro_series.displayname)
+            except launchpadlib.errors.HTTPError, e:
+                if e.response.status == 403:
+                    print "%s (%s) cannot upload %s to %s" % (
+                            person.display_name, person.name,
+                            srcpkg, distro_series.displayname)
+                else:
+                    print "There was a %s error:" % e.response.status
+                    print e.content
+
+
 def main(options, action):
 
     if action == "query":
@@ -347,6 +399,8 @@
         do_delete(options)
     elif action == "create":
         do_create(options)
+    elif action == "check":
+        do_check(options)
     else:
         raise AssertionError("Invalid action %s" % action)
 
@@ -354,7 +408,7 @@
 
 
 if __name__ == '__main__':
-    parser = OptionParser(usage="usage: %prog [options] query|add|delete|create")
+    parser = OptionParser(usage="usage: %prog [options] query|add|delete|create|check")
 
     parser.add_option(
         "-l", "--launchpad", dest="launchpad_instance", default="edge")
@@ -369,7 +423,7 @@
 
     options, args = parser.parse_args()
 
-    possible_actions = ('query', 'add', 'delete', 'create')
+    possible_actions = ('query', 'add', 'delete', 'create', 'check')
 
     if len(args) != 1:
         parser.error(
@@ -393,5 +447,5 @@
     try:
         main(options, args[0])
     except launchpadlib.errors.HTTPError, err:
-        print "There was an error:"
+        print "There was a %s error:" % err.response.status
         print err.content