Merge ~cjwatson/ubuntu-archive-tools:queue-copy-contains-build into ubuntu-archive-tools:main

[Colin Watson]

queue: Add contains-build information for copies

Now that Launchpad exposes information on whether copies contain binaries, `queue` should take advantage of that. With this, source-only copies show "X-" as before, while source-and-binary copies show "XB".

[Iain Lane (laney)]

wdyt about making `queue fetch` only fetch binaries if they are part of the copy? perhaps by way of an adjustment to `urls()`?

[Colin Watson (cjwatson)]

@laney Good idea, thanks. How's this?

[Andy Whitcroft (apw)]

Looks good. Engineered a copy with binaries (and without) and confirmed this differentiates in the manner you would expect.

review: Approve

diff --git a/queue b/queue
index d1406bd..cdde30d 100755
--- a/queue
+++ b/queue
@@ -129,7 +129,7 @@ FOOT_MARGIN = " " * (9 + 6 + 1 + 22 + 1 + 22 + 2)
 
 def make_tag(item):
     if item.contains_copy:
-        return "X-"
+        return "X" + ("B" if item.contains_build else "-")
     else:
         return (("S" if item.contains_source else "-") +
                 ("B" if item.contains_build else "-"))
@@ -231,15 +231,17 @@ def info(options, args):
 
 # Get librarian URLs for source_package_publishing_history or package_upload
 # objects
-def urls(options, item):
+def urls(item, include_source=False, include_binary=False):
     try:
         if item.contains_copy:
             archive = item.copy_source_archive
-            item = archive.getPublishedSources(
+            items = archive.getPublishedSources(
                 exact_match=True, source_name=item.package_name,
                 version=item.package_version)
-            if item:
-                return urls(options, item[0])
+            if items:
+                return urls(
+                    items[0], include_source=include_source,
+                    include_binary=include_binary and item.contains_build)
             else:
                 print("Error: Can't find source package for copy")
                 return []
@@ -253,9 +255,9 @@ def urls(options, item):
         ret.extend(item.customFileUrls())
     except AttributeError:  # Copies won't have this
         ret.append(item.changesFileUrl())
-    if options.source:
+    if include_source:
         ret.extend(item.sourceFileUrls())
-    if options.binary:
+    if include_binary:
         ret.extend(item.binaryFileUrls())
     # On staging we may get None URLs due to missing library files; filter
     # these out.
@@ -275,7 +277,9 @@ def fetch(options, args):
 
 
 def fetch_item(options, item):
-    for url in urls(options, item):
+    for url in urls(
+            item,
+            include_source=options.source, include_binary=options.binary):
         path = urlsplit(url)[2]
         filename = unquote(path.split("/")[-1])
         exists = os.path.exists(filename)
@@ -291,7 +295,9 @@ def show_urls(options, args):
     """Show the URLs from which a queue item may be downloaded."""
     items = queue_items(options, args)
     for item in items:
-        for url in urls(options, item):
+        for url in urls(
+                item,
+                include_source=options.source, include_binary=options.binary):
             print(url)
     return 0 if items else 1