← Back to team overview

launchpad-reviewers team mailing list archive

[Merge] ~cjwatson/launchpad:expire-old-private-archives into launchpad:master

 

Colin Watson has proposed merging ~cjwatson/launchpad:expire-old-private-archives into launchpad:master.

Commit message:
Expire files from a few old private PPAs

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~cjwatson/launchpad/+git/launchpad/+merge/397895

Private PPAs are normally packrats, but we need to actually get rid of deleted files from these ones.
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~cjwatson/launchpad:expire-old-private-archives into launchpad:master.
diff --git a/lib/lp/soyuz/scripts/expire_archive_files.py b/lib/lp/soyuz/scripts/expire_archive_files.py
index 12ca8c3..420fc10 100755
--- a/lib/lp/soyuz/scripts/expire_archive_files.py
+++ b/lib/lp/soyuz/scripts/expire_archive_files.py
@@ -11,7 +11,6 @@ from lp.soyuz.model.archive import Archive
 
 # PPA owners or particular PPAs that we never want to expire.
 BLACKLISTED_PPAS = """
-adobe-isv
 bzr
 bzr-beta-ppa
 bzr-nightly-ppa
@@ -34,8 +33,11 @@ wheelbarrow
 # Particular PPAs (not owners, unlike the whitelist) that should be
 # expired even if they're private.
 WHITELISTED_PPAS = """
+adobe-isv/flash64
+adobe-isv/ppa
 kubuntu-ninjas/ppa
 landscape/lds-trunk
+moblin/moblin-private-beta
 """.split()