Merge lp:~tsimonq2/ubuntu-archive-tools/skip-missing-remove-package into lp:ubuntu-archive-tools

[Simon Quigley]

Add a --skip-missing flag to remove-package.

12:02:31 PM < Lord-Kamina> My humble feedback: You guys really need to make it so remove-package doesn't auto-exit if it can't find a package name when you've provided a bunch of them.
12:04:16 PM < Lord-Kamina> For whatever reason, it won't find all package names shown in the web interface (don't know if that's a bug on the web interface or on package-remove) and when it doesn't find any package, it quits without checking the rest. So it ends up being a sysiphean task, running the script fifty times while removing one or two packages from the command each time. :P

Not that we always take feedback from IRC or anything...

[Colin Watson (cjwatson)]

This doesn't achieve the requested result. The exception handler here is outside the loop, so it will skip everything from the point of the failure and then carry on.

I think you need an extra exception handler in find_all_removables instead.

review: Needs Fixing

[lp:~tsimonq2/ubuntu-archive-tools/skip-missing-remove-package]

1179. By Simon Quigley on 2018-07-26

Remove the lputils.PackageMissing exception handling up a bit.

[Colin Watson (cjwatson)]

review: Needs Fixing

[lp:~tsimonq2/ubuntu-archive-tools/skip-missing-remove-package]

1180. By Simon Quigley on 2018-07-26

options, not args.

1181. By Simon Quigley on 2018-07-26

options, not argument.

[Colin Watson (cjwatson)]

review: Approve

=== modified file 'remove-package'
--- remove-package	2015-08-08 00:31:04 +0000
+++ remove-package	2018-07-26 18:23:28 +0000
@@ -48,21 +48,25 @@
 
 def find_all_removables(options, packages):
     for package in packages:
-        for removable in find_removables(options, package):
-            yield removable
+        try:
+            for removable in find_removables(options, package):
+                yield removable
+        except lputils.PackageMissing as message:
+            print(message)
+            if options.skip_missing:
+                print("Skipping")
+            else:
+                print("Exiting")
+                sys.exit(1)
 
 
 def remove_package(options, packages):
     removables = []
 
     print("Removing packages from %s:" % options.suite)
-    try:
-        for removable, direct in find_all_removables(options, packages):
-            removables.append((removable, direct))
-            print("\t%s%s" % ("" if direct else "\t", removable.display_name))
-    except lputils.PackageMissing as message:
-        print(message, ".  Exiting.")
-        sys.exit(1)
+    for removable, direct in find_all_removables(options, packages):
+        removables.append((removable, direct))
+        print("\t%s%s" % ("" if direct else "\t", removable.display_name))
     print("Comment: %s" % options.removal_comment)
 
     if options.dry_run:
@@ -109,6 +113,12 @@
         "-b", "--binary", dest="binaryonly",
         default=False, action="store_true", help="remove binaries only")
     parser.add_option("-m", "--removal-comment", help="removal comment")
+    parser.add_option(
+        "--skip-missing", default=False, action="store_true",
+        help=(
+            "When a package cannot be removed, normally this script exits "
+            "with a non-zero status. With --skip-missing instead, the "
+            "error is printed and removing continues"))
 
     # Deprecated in favour of -A.
     parser.add_option(