integration-tests: use codename in expected path in zzz-dists

integration-tests/test-output/0001-basic/after_accept/archives/dak-master

@@ -207,7 +207,7 @@
 ./pool/main/p/package/package_0.1-1_all.deb
 ./pool/main/p/package/package_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/0005-encoding/after_install/archives/debian-debug

@@ -263,7 +263,7 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/0005-encoding/after_install/archives/ftp-master

@@ -326,7 +326,7 @@
 ./pool/main/s/snowman/snowman_0.1-1_all.deb
 ./pool/main/s/snowman/snowman_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/0005-encoding/after_remove/archives/debian-debug

@@ -263,7 +263,7 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/0005-encoding/after_remove/archives/ftp-master

@@ -326,7 +326,7 @@
 ./pool/main/s/snowman/snowman_0.1-1_all.deb
 ./pool/main/s/snowman/snowman_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2000-dinstall/end/archives/debian-debug

@@ -552,11 +552,11 @@
 ./pool/main/m/main-contrib-with-debug/main-contrib-with-debug_0.2-1.dsc
 ./pool/main/m/main-contrib-with-debug/main-contrib-with-debug_0.2.orig.tar.gz
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2000-dinstall/end/archives/ftp-master

@@ -1165,19 +1165,19 @@
 ./pool/main/p/package/package_0.1-1_all.deb
 ./pool/main/p/package/package_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2001-cruft/after_dinstall_nviu/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2001-cruft/after_dinstall_nviu/archives/ftp-master

@@ -1158,19 +1158,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2001-cruft/before_dinstall_nviu/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2001-cruft/before_dinstall_nviu/archives/ftp-master

@@ -1079,19 +1079,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2001-cruft/end/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2001-cruft/end/archives/ftp-master

@@ -1183,19 +1183,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2002-c-s-versionchecks/end/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2002-c-s-versionchecks/end/archives/ftp-master

@@ -1123,19 +1123,19 @@
 ./pool/main/b/binnmupkg/binnmupkg_0.1-2.tar.gz
 ./pool/main/b/binnmupkg/binnmupkg_0.1-2_amd64.deb
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-1/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-1/archives/ftp-master

@@ -1069,19 +1069,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-2/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-2/archives/ftp-master

@@ -1084,19 +1084,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-3/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-3/archives/ftp-master

@@ -1127,19 +1127,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-4/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-4/archives/ftp-master

@@ -1150,19 +1150,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-5/archives/debian-debug

@@ -523,11 +523,11 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/testing-debug
-./zzz-dists/testing-debug/InRelease
-./zzz-dists/testing-debug/Release
-./zzz-dists/testing-debug/Release.gpg
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/buster-debug
+./zzz-dists/buster-debug/InRelease
+./zzz-dists/buster-debug/Release
+./zzz-dists/buster-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/2003-c-s-propup/c-s-propup-5/archives/ftp-master

@@ -1192,19 +1192,19 @@
 ./pool/main/p/pkgnew/pkgnew_0.1-2~exp.dsc
 ./pool/main/p/pkgnew/pkgnew_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/experimental
-./zzz-dists/experimental/InRelease
-./zzz-dists/experimental/Release
-./zzz-dists/experimental/Release.gpg
-./zzz-dists/testing
-./zzz-dists/testing-proposed-updates
-./zzz-dists/testing-proposed-updates/InRelease
-./zzz-dists/testing-proposed-updates/Release
-./zzz-dists/testing-proposed-updates/Release.gpg
-./zzz-dists/testing/InRelease
-./zzz-dists/testing/Release
-./zzz-dists/testing/Release.gpg
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/buster
+./zzz-dists/buster-proposed-updates
+./zzz-dists/buster-proposed-updates/InRelease
+./zzz-dists/buster-proposed-updates/Release
+./zzz-dists/buster-proposed-updates/Release.gpg
+./zzz-dists/buster/InRelease
+./zzz-dists/buster/Release
+./zzz-dists/buster/Release.gpg
+./zzz-dists/rc-buggy
+./zzz-dists/rc-buggy/InRelease
+./zzz-dists/rc-buggy/Release
+./zzz-dists/rc-buggy/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/3000-throwaway-new/after-dinstall/archives/debian-debug

@@ -263,7 +263,7 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/3000-throwaway-new/after-dinstall/archives/ftp-master

@@ -349,7 +349,7 @@
 ./pool/non-free/n/nonfree-package/nonfree-package_0.1-1_all.deb
 ./pool/non-free/n/nonfree-package/nonfree-package_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg

integration-tests/test-output/3000-throwaway-new/package-accepted-from-new/archives/debian-debug

@@ -263,7 +263,7 @@
 ./indices
 ./indices/package-file.map.bz2
 ./zzz-dists
-./zzz-dists/unstable-debug
-./zzz-dists/unstable-debug/InRelease
-./zzz-dists/unstable-debug/Release
-./zzz-dists/unstable-debug/Release.gpg
+./zzz-dists/sid-debug
+./zzz-dists/sid-debug/InRelease
+./zzz-dists/sid-debug/Release
+./zzz-dists/sid-debug/Release.gpg

integration-tests/test-output/3000-throwaway-new/package-accepted-from-new/archives/ftp-master

@@ -287,7 +287,7 @@
 ./pool/non-free/n/nonfree-package/nonfree-package_0.1-1_all.deb
 ./pool/non-free/n/nonfree-package/nonfree-package_0.1.orig.tar.gz
 ./zzz-dists
-./zzz-dists/unstable
-./zzz-dists/unstable/InRelease
-./zzz-dists/unstable/Release
-./zzz-dists/unstable/Release.gpg
+./zzz-dists/sid
+./zzz-dists/sid/InRelease
+./zzz-dists/sid/Release
+./zzz-dists/sid/Release.gpg