launchpad-reviewers team mailing list archive

[Julian Andres Klode <mp+481414@xxxxxxxxxxxxxxxxxx>]

Julian Andres Klode has proposed merging ~juliank/launchpad:apt-ftparchive-per-distro-cache-cache into launchpad:master.

Requested reviews:
  Launchpad code reviewers (launchpad-reviewers)

For more details, see:
https://code.launchpad.net/~juliank/launchpad/+git/launchpad/+merge/481414
-- 
Your team Launchpad code reviewers is requested to review the proposed merge of ~juliank/launchpad:apt-ftparchive-per-distro-cache-cache into launchpad:master.

diff --git a/lib/lp/archivepublisher/model/ftparchive.py b/lib/lp/archivepublisher/model/ftparchive.py
index 26eb048..05ad6f2 100644
--- a/lib/lp/archivepublisher/model/ftparchive.py
+++ b/lib/lp/archivepublisher/model/ftparchive.py
@@ -109,8 +109,8 @@ tree "%(DISTS)s/%(DISTRORELEASEONDISK)s"
     Packages::Compress "%(COMPRESSORS)s";
     Sources::Compress "%(COMPRESSORS)s";
     Translation::Compress "%(COMPRESSORS)s";
-    BinCacheDB "packages%(CACHEINSERT)s-$(ARCH).db";
-    SrcCacheDB "sources%(CACHEINSERT)s.db";
+    BinCacheDB "packages%(CACHEINSERT)s-%(DISTRORELEASE)s-$(ARCH).db";
+    SrcCacheDB "sources%(CACHEINSERT)s-%(DISTRORELEASE)s.db";
     Contents " ";
     LongDescription "%(LONGDESCRIPTION)s";
 }
diff --git a/lib/lp/archivepublisher/tests/apt-data/apt.conf b/lib/lp/archivepublisher/tests/apt-data/apt.conf
index 4bf0d30..a446860 100644
--- a/lib/lp/archivepublisher/tests/apt-data/apt.conf
+++ b/lib/lp/archivepublisher/tests/apt-data/apt.conf
@@ -34,8 +34,8 @@ tree "dists/hoary-test"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-hoary-test-$(ARCH).db";
+    SrcCacheDB "sources-hoary-test.db";
     Contents " ";
     LongDescription "true";
 }
@@ -55,7 +55,7 @@ tree "dists/hoary-test/main"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test.db";
     Contents " ";
     LongDescription "true";
 }
@@ -75,7 +75,7 @@ tree "dists/hoary-test/restricted"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test.db";
     Contents " ";
     LongDescription "true";
 }
@@ -95,7 +95,7 @@ tree "dists/hoary-test/universe"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test.db";
     Contents " ";
     LongDescription "true";
 }
@@ -115,7 +115,7 @@ tree "dists/hoary-test/multiverse"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test.db";
     Contents " ";
     LongDescription "true";
 }
@@ -134,8 +134,8 @@ tree "dists/hoary-test-security"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-hoary-test-security-$(ARCH).db";
+    SrcCacheDB "sources-hoary-test-security.db";
     Contents " ";
     LongDescription "true";
 }
@@ -155,7 +155,7 @@ tree "dists/hoary-test-security/main"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-security.db";
     Contents " ";
     LongDescription "true";
 }
@@ -175,7 +175,7 @@ tree "dists/hoary-test-security/restricted"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-security.db";
     Contents " ";
     LongDescription "true";
 }
@@ -195,7 +195,7 @@ tree "dists/hoary-test-security/universe"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-security.db";
     Contents " ";
     LongDescription "true";
 }
@@ -215,7 +215,7 @@ tree "dists/hoary-test-security/multiverse"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-security.db";
     Contents " ";
     LongDescription "true";
 }
@@ -234,8 +234,8 @@ tree "dists/hoary-test-updates"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-hoary-test-updates-$(ARCH).db";
+    SrcCacheDB "sources-hoary-test-updates.db";
     Contents " ";
     LongDescription "true";
 }
@@ -255,7 +255,7 @@ tree "dists/hoary-test-updates/main"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-updates.db";
     Contents " ";
     LongDescription "true";
 }
@@ -275,7 +275,7 @@ tree "dists/hoary-test-updates/restricted"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-updates.db";
     Contents " ";
     LongDescription "true";
 }
@@ -295,7 +295,7 @@ tree "dists/hoary-test-updates/universe"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-updates.db";
     Contents " ";
     LongDescription "true";
 }
@@ -315,7 +315,7 @@ tree "dists/hoary-test-updates/multiverse"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-updates.db";
     Contents " ";
     LongDescription "true";
 }
@@ -334,8 +334,8 @@ tree "dists/hoary-test-proposed"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-hoary-test-proposed-$(ARCH).db";
+    SrcCacheDB "sources-hoary-test-proposed.db";
     Contents " ";
     LongDescription "true";
 }
@@ -355,7 +355,7 @@ tree "dists/hoary-test-proposed/main"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-proposed.db";
     Contents " ";
     LongDescription "true";
 }
@@ -375,7 +375,7 @@ tree "dists/hoary-test-proposed/restricted"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-proposed.db";
     Contents " ";
     LongDescription "true";
 }
@@ -395,7 +395,7 @@ tree "dists/hoary-test-proposed/universe"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-proposed.db";
     Contents " ";
     LongDescription "true";
 }
@@ -415,7 +415,7 @@ tree "dists/hoary-test-proposed/multiverse"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-proposed.db";
     Contents " ";
     LongDescription "true";
 }
@@ -434,8 +434,8 @@ tree "dists/hoary-test-backports"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-hoary-test-backports-$(ARCH).db";
+    SrcCacheDB "sources-hoary-test-backports.db";
     Contents " ";
     LongDescription "true";
 }
@@ -455,7 +455,7 @@ tree "dists/hoary-test-backports/main"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-backports.db";
     Contents " ";
     LongDescription "true";
 }
@@ -475,7 +475,7 @@ tree "dists/hoary-test-backports/restricted"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-backports.db";
     Contents " ";
     LongDescription "true";
 }
@@ -495,7 +495,7 @@ tree "dists/hoary-test-backports/universe"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-backports.db";
     Contents " ";
     LongDescription "true";
 }
@@ -515,7 +515,7 @@ tree "dists/hoary-test-backports/multiverse"
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
     BinCacheDB "packages-debian-installer-$(ARCH).db";
-    SrcCacheDB "sources-debian-installer.db";
+    SrcCacheDB "sources-debian-installer-hoary-test-backports.db";
     Contents " ";
     LongDescription "true";
 }
@@ -534,8 +534,8 @@ tree "dists/breezy-autotest"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-breezy-autotest-$(ARCH).db";
+    SrcCacheDB "sources-breezy-autotest.db";
     Contents " ";
     LongDescription "false";
 }
@@ -554,8 +554,8 @@ tree "dists/breezy-autotest-security"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-breezy-autotest-security-$(ARCH).db";
+    SrcCacheDB "sources-breezy-autotest-security.db";
     Contents " ";
     LongDescription "false";
 }
@@ -574,8 +574,8 @@ tree "dists/breezy-autotest-updates"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-breezy-autotest-updates-$(ARCH).db";
+    SrcCacheDB "sources-breezy-autotest-updates.db";
     Contents " ";
     LongDescription "false";
 }
@@ -594,8 +594,8 @@ tree "dists/breezy-autotest-proposed"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-breezy-autotest-proposed-$(ARCH).db";
+    SrcCacheDB "sources-breezy-autotest-proposed.db";
     Contents " ";
     LongDescription "false";
 }
@@ -614,8 +614,8 @@ tree "dists/breezy-autotest-backports"
     Packages::Compress "gzip bzip2";
     Sources::Compress "gzip bzip2";
     Translation::Compress "gzip bzip2";
-    BinCacheDB "packages-$(ARCH).db";
-    SrcCacheDB "sources.db";
+    BinCacheDB "packages-breezy-autotest-backports-$(ARCH).db";
+    SrcCacheDB "sources-breezy-autotest-backports.db";
     Contents " ";
     LongDescription "false";
 }