Merge lp:~julian-edwards/launchpad/archive-url-bug-520520 into lp:launchpad

[Julian Edwards]

Fix archive_url for copy archives, it was missing the distribution name at the end

[Julian Edwards (julian-edwards)]

= Summary =
Fix archive_url for copy archives - it was missing the distribution name at
the end

== Proposed fix ==
The IArchive.archive_url property for "copy" archives was missing the
distribution name as the last path component.

== Pre-implementation notes ==
Error found during QA!

== Implementation details ==
It's a trivial change ...

== 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/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)

[Francis J. Lacoste (flacoste)]

review: Approve (release-critical)

[Henning Eggers (henninge)]

review: Approve (code)

=== modified file 'lib/lp/soyuz/doc/archive.txt'
--- lib/lp/soyuz/doc/archive.txt	2010-02-19 14:17:10 +0000
+++ lib/lp/soyuz/doc/archive.txt	2010-03-01 14:15:32 +0000
@@ -1474,7 +1474,7 @@
     >>> print copy_target.archive.is_copy
     True
     >>> print copy_target.archive.archive_url
-    http://rebuild-test.internal/ubuntu-my-copy-archive
+    http://rebuild-test.internal/ubuntu-my-copy-archive/ubuntu
 
 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-19 14:13:24 +0000
+++ lib/lp/soyuz/model/archive.py	2010-03-01 14:15:32 +0000
@@ -299,9 +299,10 @@
                     (self.owner.name, self.name, self.distribution.name)))
 
         if self.is_copy:
-            return urlappend(
+            url = urlappend(
                 config.archivepublisher.copy_base_url,
                 self.distribution.name + '-' + self.name)
+            return urlappend(url, self.distribution.name)
 
         try:
             postfix = archive_postfixes[self.purpose]