Merge lp:~laney/ubuntu-archive-tools/generate-freeze-block into lp:ubuntu-archive-tools

[Iain Lane]

Add a new -n/--not-unique mode to generate a block for packages which FLAVOURS seed in common with other flavours.

I just re-confused myself about the semantics of this option, but it's what we wanted near trusty-release combined with the auto accept script. Read

  http://irclogs.ubuntu.com/2014/04/11/%23ubuntu-release.html#t08:58

onwards to see what was going on at the time. I just found it uncommitted in my home directory. :(

The second commit is a bugfix to -u mode. Currently -u <flavours> and -u <flavours> <more flavours> can have some packages in the first set but not the second, which should never happen.

=== modified file 'generate-freeze-block'
--- generate-freeze-block	2014-02-24 18:37:45 +0000
+++ generate-freeze-block	2014-09-19 17:12:26 +0000
@@ -78,12 +78,18 @@
                         help='Block only packages unique to FLAVOURS')
     parser.add_argument('--debug', '-d', action='store_true',
                         help='Output some extra debugging')
+    parser.add_argument('--not-unique','-n', action='store_true',
+                        help='Block only packages also seeded outside of FLAVOURS')
     args = parser.parse_args()
 
     logging.basicConfig(stream=sys.stderr,
                         level=(logging.DEBUG if args.debug
                                else logging.WARNING))
 
+    if args.not_unique and args.only_unique:
+        LOGGER.error("Cannot specify --not-unique and --only-unique at the same time.")
+        sys.exit(1)
+
     packages = GetPackage()
 
     output = set()
@@ -97,27 +103,31 @@
         source_pkg = packages.getsourcepackage(k)
         seeding_flavours = set([x[0] for x in v if x[1] != "supported"])
 
+        if source_pkg and source_pkg in skip:
+            continue
+
         # If you don't get to freeze others' packages
-        if args.only_unique:
+        if args.only_unique or args.not_unique:
             not_releasing_seeding_flavours = seeding_flavours - flavours
         else:
             not_releasing_seeding_flavours = None
 
-        if not_releasing_seeding_flavours:
+        if not_releasing_seeding_flavours and args.only_unique:
             LOGGER.debug(("Skipping %s (%s binary package) because it's"
                          + " seeded on %s") % (source_pkg, k, v))
             output.discard(source_pkg)
             skip.add(source_pkg)
             continue
-
-        if source_pkg and source_pkg in skip:
+        elif source_pkg and flavours < seeding_flavours and not_releasing_seeding_flavours and args.not_unique:
+            LOGGER.debug("Adding %s (%s binary package) due to %s (non-unique)"
+                         % (source_pkg, k, v))
+            output.add(source_pkg)
             continue
 
-        if seeding_flavours.intersection(flavours) and source_pkg:
+        if not args.not_unique and seeding_flavours.intersection(flavours) and source_pkg:
             LOGGER.debug("Adding %s (%s binary package) due to %s"
                          % (source_pkg, k, v))
             output.add(source_pkg)
-            skip.add(source_pkg)
 
     print ("block", " ".join(sorted(output)))