Merge lp:~stefanor/ubuntu-archive-tools/edit-packagesets into lp:ubuntu-archive-tools

[Stefano Rivera]

Updates to edit-acl, for the changes proposed in lp:~stefanor/launchpad/edit-packagesets

Not particularly pretty, but they'll serve.

[lp:~stefanor/ubuntu-archive-tools/edit-packagesets]

612. By Stefano Rivera on 2012-09-29

Display LP set details before confirming deletion

613. By Stefano Rivera on 2012-09-29

Check for uploaders before allowing packageset deletion

614. By Stefano Rivera on 2012-09-29

Line up output

615. By Stefano Rivera on 2012-09-29

404 is expected

616. By Stefano Rivera on 2012-10-01

Use the destructor, rather than calling a delete method

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'edit-acl'
--- edit-acl	2012-08-23 10:13:41 +0000
+++ edit-acl	2012-10-01 13:49:32 +0000
@@ -6,6 +6,7 @@
 # Copyright (C) 2010  Michael Bienia <[e-mail]>
 # Copyright (C) 2011  Iain Lane <[e-mail]>
 # Copyright (C) 2011  Soren Hansen <[e-mail]>
+# Copyright (C) 2012  Stefano Rivera <[e-mail]>
 
 # This program is free software: you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -61,6 +62,17 @@
                                  ', '.join(desc)))
 
 
+def multiline_input(prompt):
+    print(prompt)
+    print("End with a line containing only a full-stop '.'")
+    buf = []
+    while True:
+        line = input()
+        if line == '.':
+            return '\n'.join(buf)
+        buf.append(line)
+
+
 def get_archive(options, launchpad):
     if options.archive is None:
         return options.distro.main_archive
@@ -207,7 +219,7 @@
         print_perms(perms, options.series)
 
 
-def validate_add_delete_options(options):
+def validate_add_delete_options(options, requires_person=True):
     if options.packageset and options.source:
         # Special options to manage package sets, bodged into this tool
         # since they aren't entirely inconvenient here.
@@ -217,8 +229,8 @@
             return False
         return True
 
-    if not options.person:
-        print("You must specify at least one person to authorise.")
+    if requires_person and not options.person:
+        print("You must specify at least one person to (de-)authorise.")
         return False
 
     count = 0
@@ -315,7 +327,10 @@
 
 def do_delete(options):
     """Delete a permission."""
-    if not validate_add_delete_options(options):
+    # We kind of hacked packageset management into here.
+    # Deleting packagesets doesn't require a person...
+    requires_person = not (options.packageset and not options.source)
+    if not validate_add_delete_options(options, requires_person):
         return False
 
     archive = get_archive(options, launchpad)
@@ -331,6 +346,34 @@
                 print(source)
         return
 
+    if options.packageset and not options.person:
+        lp_series = options.distro.getSeries(name_or_version=options.series)
+        for packageset in options.packageset:
+            lp_set = launchpad.packagesets.getByName(name=packageset,
+                                                     distroseries=lp_series)
+            uploaders = archive.getUploadersForPackageset(
+                    direct_permissions=True, packageset=lp_set)
+            if len(uploaders) > 0:
+                print("Cannot delete packageset with defined uploaders")
+                print("Current uploaders:")
+                for permission in uploaders:
+                    print(" %s" % permission.person.name)
+                continue
+            print("Confirm removal of packageset '%s'" % lp_set.name)
+            print("Description:")
+            print("  " + lp_set.description.replace("\n", "\n  "))
+            print("Containing Sources:")
+            for member in lp_set.getSourcesIncluded():
+                print("  %s" % member)
+            print("Containing packagesets:")
+            for member in lp_set.setsIncluded():
+                print("  %s" % member.name)
+            ack = input("Remove? (y/N): ")
+            if ack.lower() == 'y':
+                lp_set.lp_delete()
+                print("Deleted %s/%s" % (lp_set.name, lp_series.name))
+        return
+
     lp_people = [launchpad.people[person] for person in options.person]
 
     if options.source:
@@ -417,12 +460,61 @@
                 continue
         except (TypeError, launchpadlib.errors.HTTPError):
             pass
-        desc = input("Description for new package set %s: " % packageset)
+        desc = multiline_input("Description for new package set %s:"
+                               % packageset)
         ps = launchpad.packagesets.new(name=packageset, description=desc,
                                 distroseries=distro_series, owner=lp_person)
         print(ps)
 
 
+def do_modify(options):
+    if not options.packageset:
+        print("You can only modify a package set, not something else.")
+        return False
+
+    if options.person and len(options.person) > 1:
+        print("You can only specify one person as the new packageset owner.")
+        return False
+
+    if options.series:
+        distro_series = options.distro.getSeries(
+            name_or_version=options.series)
+    else:
+        distro_series = options.distro.getDevelopmentSeries()[0]
+
+    lp_person = None
+    if options.person:
+        lp_person = launchpad.people[options.person[0]]
+
+    for packageset in options.packageset:
+        lp_set = launchpad.packagesets.getByName(
+            name=packageset, distroseries=distro_series)
+        if lp_person:
+            print("Making %s the owner of %s/%s"
+                  % (lp_person.name, lp_set.name, distro_series.name))
+            lp_set.owner = lp_person
+            lp_set.lp_save()
+            continue
+
+        print("Current description of %s:" % lp_set.name)
+        print("  " + lp_set.description.replace("\n", "\n  "))
+        desc = multiline_input("New description [blank=leave unmodified]:")
+        if desc:
+            print("Modifying description of %s/%s"
+                  % (lp_set.name, distro_series.name))
+            lp_set.description = desc
+            lp_set.lp_save()
+            continue
+
+        rename = input("Rename %s to? [blank=don't rename]: " % lp_set.name)
+        if rename:
+            print("Renaming %s/%s -> %s"
+                  % (lp_set.name, distro_series.name, rename))
+            lp_set.name = rename
+            lp_set.lp_save()
+            continue
+
+
 def do_copy(options):
     if options.archive is None:
         archives = options.distro.archives
@@ -540,6 +632,8 @@
         do_delete(options)
     elif action == "create":
         do_create(options)
+    elif action == "modify":
+        do_modify(options)
     elif action == "copy":
         do_copy(options)
     elif action == "check":
@@ -552,7 +646,8 @@
 
 if __name__ == '__main__':
     parser = OptionParser(
-        usage="usage: %prog [options] query|add|delete|create|copy|check")
+        usage="usage: %prog [options] "
+              "query|add|delete|create|modify|copy|check")
 
     parser.add_option(
         "-l", "--launchpad", dest="launchpad_instance", default="production")