Merge lp:~wgrant/launchpad/no-uca-expire into lp:launchpad

Proposed by William Grant
Status: Merged
Merged at revision: 18296
Proposed branch: lp:~wgrant/launchpad/no-uca-expire
Merge into: lp:launchpad
Diff against target: 32 lines (+5/-4)
1 file modified
lib/lp/soyuz/scripts/expire_archive_files.py (+5/-4)
To merge this branch: bzr merge lp:~wgrant/launchpad/no-uca-expire
Reviewer Review Type Date Requested Status
Colin Watson (community) Approve
Review via email: mp+313303@code.launchpad.net

Commit message

Blacklist the Ubuntu Cloud Archive from PPA expiry.

Description of the change

Blacklist the Ubuntu Cloud Archive from PPA expiry.

To post a comment you must log in.
Revision history for this message
Colin Watson (cjwatson) wrote :

Can we sort this list while you're here? But otherwise fine.

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/scripts/expire_archive_files.py'
2--- lib/lp/soyuz/scripts/expire_archive_files.py 2015-06-08 18:29:13 +0000
3+++ lib/lp/soyuz/scripts/expire_archive_files.py 2016-12-15 08:58:53 +0000
4@@ -12,6 +12,9 @@
5 # PPA owners or particular PPAs that we never want to expire.
6 BLACKLISTED_PPAS = """
7 adobe-isv
8+bzr
9+bzr-beta-ppa
10+bzr-nightly-ppa
11 chelsea-team
12 ci-train-ppa-service/stable-phone-overlay
13 dennis-team
14@@ -23,18 +26,16 @@
15 oem-solutions-group
16 payson
17 transyl
18+ubuntu-cloud-archive
19 ubuntu-mobile
20 wheelbarrow
21-bzr
22-bzr-beta-ppa
23-bzr-nightly-ppa
24 """.split()
25
26 # Particular PPAs (not owners, unlike the whitelist) that should be
27 # expired even if they're private.
28 WHITELISTED_PPAS = """
29+kubuntu-ninjas/ppa
30 landscape/lds-trunk
31-kubuntu-ninjas/ppa
32 """.split()
33
34