tests/empty-sources.list: only write out /etc/apt/sources.list if it doesn't exist yet

In the mmdebstrap autpkgtest, debian/tests/sourcesfilter will write out /etc/apt/sources.list before the test's setup-hook is run. Thus, the test's setup-hook will overwrite the contents of the sources.list that debian/tests/sourcesfilter set up, which will end up pulling in the wrong packages. Thus, only write out our own /etc/apt/sources.list if it does not yet exist. If it does exist, nothing needs to be done.
Mark oldstable as bullseye_or_later
2024-06-11 15:49:48 +02:00 · 2024-06-11 15:49:48 +02:00 · 2024-06-11 15:49:48 +02:00 · 2024-06-11 15:49:48 +02:00 · 2024-06-11 15:49:48 +02:00
2 changed files with 2 additions and 2 deletions
--- a/coverage.txt
+++ b/coverage.txt
@ -273,7 +273,7 @@ Test: debootstrap-no-op-options
 Needs-Root: true

 Test: verbose
-Variants: - standard
+Variants: standard
 Skip-If:
 variant == "standard" and dist == "oldstable" # #864082, #1004557, #1004558

--- a/tests/empty-sources.list
+++ b/tests/empty-sources.list
@ -3,6 +3,6 @@ set -eu
 export LC_ALL=C.UTF-8
 trap "rm -f /tmp/debian-chroot.tar" EXIT INT TERM
 printf '' | {{ CMD }} --mode={{ MODE }} --variant=apt \
-	--setup-hook='echo "deb {{ MIRROR }} {{ DIST }} main" > "$1"/etc/apt/sources.list' \
+	--setup-hook='test -e "$1"/etc/apt/sources.list || echo "deb {{ MIRROR }} {{ DIST }} main" > "$1"/etc/apt/sources.list' \
 	{{ DIST }} /tmp/debian-chroot.tar -
 tar -tf /tmp/debian-chroot.tar | sort | diff -u tar1.txt -
Author	SHA1	Message	Date
Johannes Schauer Marin Rodrigues	dfeb21cfe5	tests/empty-sources.list: only write out /etc/apt/sources.list if it doesn't exist yet In the mmdebstrap autpkgtest, debian/tests/sourcesfilter will write out /etc/apt/sources.list before the test's setup-hook is run. Thus, the test's setup-hook will overwrite the contents of the sources.list that debian/tests/sourcesfilter set up, which will end up pulling in the wrong packages. Thus, only write out our own /etc/apt/sources.list if it does not yet exist. If it does exist, nothing needs to be done.	2024-06-11 15:49:48 +02:00
Jochen Sprickerhof	d0add325d3	Mark oldstable as bullseye_or_later	2024-06-11 15:49:48 +02:00
Johannes Schauer Marin Rodrigues	d4149bb4db	coverage.sh: add missing newline at end of curl output	2024-06-11 15:49:48 +02:00
Johannes Schauer Marin Rodrigues	61509691a8	tests: base-files now ships merged-/usr symlinks	2024-06-11 15:49:48 +02:00
Johannes Schauer Marin Rodrigues	3969727cc0	tests: bug #1031276 got fixed	2024-06-11 15:49:48 +02:00