Launchpad itself

Merge lp:~wgrant/launchpad/bug-433739-debug-archive-urls into lp:launchpad

  1. bug-433739-debug-archive-urls
  2. Merge into devel
Proposed by William Grant
Status: Merged
Merged at revision: not available
Proposed branch: lp:~wgrant/launchpad/bug-433739-debug-archive-urls
Merge into: lp:launchpad
Diff against target: 26 lines
2 files modified
lib/lp/soyuz/doc/archive.txt (+4/-0)
lib/lp/soyuz/model/archive.py (+1/-0)
To merge this branch: bzr merge lp:~wgrant/launchpad/bug-433739-debug-archive-urls
Reviewer Review Type Date Requested Status
Julian Edwards (community) Approve
Review via email: mp+13107@code.launchpad.net
To post a comment you must log in.
Revision history for this message
William Grant (wgrant) wrote :

This branch fixes bug #433739 by trivially defining archive_url for archives with purpose DEBUG. The published archive ends up with '-debug' on the end, so the URL should too.

Revision history for this message
Julian Edwards (julian-edwards) wrote :

Thanks for the fix William.

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'lib/lp/soyuz/doc/archive.txt'
2--- lib/lp/soyuz/doc/archive.txt 2009-09-23 07:41:13 +0000
3+++ lib/lp/soyuz/doc/archive.txt 2009-10-09 06:00:40 +0000
4@@ -1443,6 +1443,10 @@
5 ... ubuntutest, ArchivePurpose.PRIMARY).archive_url
6 http://ftpmaster.internal/ubuntutest
7
8+ >>> print getUtility(IArchiveSet).getByDistroPurpose(
9+ ... ubuntu, ArchivePurpose.DEBUG).archive_url
10+ http://ftpmaster.internal/ubuntu-debug
11+
12 If the archive is private, the url may be different as private PPAs
13 are published to a secure location.
14
15
16=== modified file 'lib/lp/soyuz/model/archive.py'
17--- lib/lp/soyuz/model/archive.py 2009-09-30 14:30:46 +0000
18+++ lib/lp/soyuz/model/archive.py 2009-10-09 06:00:40 +0000
19@@ -259,6 +259,7 @@
20 archive_postfixes = {
21 ArchivePurpose.PRIMARY : '',
22 ArchivePurpose.PARTNER : '-partner',
23+ ArchivePurpose.DEBUG : '-debug',
24 }
25
26 if self.is_ppa: