Merge lp:~laney/ubuntu-archive-tools/queue-fetch-copies into lp:ubuntu-archive-tools

[Iain Lane]

Now that we can get the source archive for copies, it's fairly straightforward to extend queue to fetch them.

I took a fairly minimal approach and the changes to make urls() work for both SPPH and package_upload objects might be confusing/bad style. If so then some more refactoring could be done.

[Colin Watson (cjwatson)]

Looks good to me. Thanks!

review: Approve

=== modified file 'queue'
--- queue	2012-12-19 10:20:09 +0000
+++ queue	2013-04-23 21:09:29 +0000
@@ -227,12 +227,17 @@
     return 0
 
 
+# Get librarian URLs for source_package_publishing_history or package_upload
+# objects
 def urls(item):
     urls = []
-    urls.append(item.changes_file_url)
+    try:
+        urls.append(item.changes_file_url)
+        urls.extend(item.customFileUrls())
+    except AttributeError: # Copies won't have this
+        urls.append(item.changesFileUrl())
     urls.extend(item.sourceFileUrls())
     urls.extend(item.binaryFileUrls())
-    urls.extend(item.customFileUrls())
     # On staging we may get None URLs due to missing library files; filter
     # these out.
     urls = list(filter(None, urls))
@@ -246,22 +251,33 @@
     for item in items:
         if item.contains_copy:
             # TODO perhaps fetch from the copy source?
-            print("Cannot fetch %s (copy)" % display_name(item))
+            print("Fetching %s (copy)" % display_name(item))
+            archive = item.copy_source_archive
+            item = archive.getPublishedSources(exact_match=True,
+                                               source_name=item.package_name,
+                                               version=item.package_version)
+            if item:
+                fetch_item(options, item[0])
+            else:
+                print("Error: Can't fetch source package")
         else:
             print("Fetching %s" % display_name(item))
-            for url in urls(item):
-                path = urlsplit(url)[2]
-                filename = unquote(path.split("/")[-1])
-                exists = os.path.exists(filename)
-                if options.overwrite or not exists:
-                    print("Constructing %s (%s)" % (filename, url))
-                    urlretrieve(url, filename)
-                elif exists:
-                    print("Not overwriting existing %s with %s" %
-                          (filename, url))
+            fetch_item(options, item)
             ret = 0
     return ret
 
+def fetch_item(options, item):
+    for url in urls(item):
+        path = urlsplit(url)[2]
+        filename = unquote(path.split("/")[-1])
+        exists = os.path.exists(filename)
+        if options.overwrite or not exists:
+                print("Constructing %s (%s)" % (filename, url))
+                urlretrieve(url, filename)
+        elif exists:
+            print("Not overwriting existing %s with %s" %
+                  (filename, url))
+            ret = 0
 
 def show_urls(options, args):
     """Show the URLs from which a queue item may be downloaded."""