Merge lp:~julian-edwards/launchpad/publish-copy-archives-bug-520520-copy-url into lp:launchpad

[Julian Edwards]

Add IArchive.archive_url response for COPY archive types

[Julian Edwards (julian-edwards)]

= Summary =
Add IArchive.archive_url response for COPY archive types

== Proposed fix ==
As part of the fix for bug 520520 to publish copy archives (rebuilds) we need
to establish a URL for the published repository. This branch makes that
change.

== Implementation details ==
Pretty simple change plus some config added for a new base url.

== Tests ==
bin/test -cvvt archive.txt

== Demo and Q/A ==

= Launchpad lint =

Checking for conflicts. and issues in doctests and templates.
Running jslint, xmllint, pyflakes, and pylint.
Using normal rules.

Linting changed files:
  lib/canonical/config/schema-lazr.conf
  lib/lp/soyuz/doc/archive.txt
  lib/lp/soyuz/model/archive.py

== Pylint notices ==

lib/lp/soyuz/model/archive.py
    14: [F0401] Unable to import 'lazr.lifecycle.event' (No module named
lifecycle)

[Paul Hummer (rockstar)]

Short branch, easy review, I approve!

review: Approve (code)

=== modified file 'lib/canonical/config/schema-lazr.conf'
--- lib/canonical/config/schema-lazr.conf	2010-01-22 04:01:17 +0000
+++ lib/canonical/config/schema-lazr.conf	2010-02-18 17:25:22 +0000
@@ -27,6 +27,7 @@
 # External base URL for distribution archives.
 # datatype: string
 base_url: http://ftpmaster.internal/
+copy_base_url: http://rebuild-test.internal/
 
 
 [calculate_bug_heat]

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-01-26 11:34:26 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-02-18 17:25:22 +0000
@@ -1342,9 +1342,9 @@
 package copy request:
 
     >>> requestor = factory.makePerson(name='me-copy')
-    >>> target = factory.makeCopyArchiveLocation(distribution=ubuntu,
-    ...     name='my-copy-archive')
-    >>> pcr = ubuntu.main_archive.requestPackageCopy(target, requestor)
+    >>> copy_target = factory.makeCopyArchiveLocation(
+    ...     distribution=ubuntu, name='my-copy-archive')
+    >>> pcr = ubuntu.main_archive.requestPackageCopy(copy_target, requestor)
     >>> print pcr
     Package copy request
     source = primary/hoary/-/RELEASE
@@ -1357,7 +1357,7 @@
 The requestPackageCopy method can also take an optional suite name:
 
     >>> package_copy_request = ubuntu.main_archive.requestPackageCopy(
-    ...     target, requestor, suite="hoary-updates");
+    ...     copy_target, requestor, suite="hoary-updates");
     >>> print package_copy_request
     Package copy request
     source = primary/hoary/-/UPDATES
@@ -1466,6 +1466,13 @@
     ...     ubuntu, ArchivePurpose.DEBUG).archive_url
     http://ftpmaster.internal/ubuntu-debug
 
+COPY archives use a URL format of <distro-name>-<archive-name>:
+
+    >>> print copy_target.archive.is_copy
+    True
+    >>> print copy_target.archive.archive_url
+    http://rebuild-test.internal/ubuntu-my-copy-archive
+
 If the archive is private, the url may be different as private PPAs
 are published to a secure location.
 

=== modified file 'lib/lp/soyuz/model/archive.py'
--- lib/lp/soyuz/model/archive.py	2010-02-02 12:04:19 +0000
+++ lib/lp/soyuz/model/archive.py	2010-02-18 17:25:22 +0000
@@ -288,6 +288,11 @@
                 url, "/".join(
                     (self.owner.name, self.name, self.distribution.name)))
 
+        if self.is_copy:
+            return urlappend(
+                config.archivepublisher.copy_base_url,
+                self.distribution.name + '-' + self.name)
+
         try:
             postfix = archive_postfixes[self.purpose]
         except KeyError: