From 0da2ed1365dfddac54ba2e095a8d46bc4684a820 Mon Sep 17 00:00:00 2001 From: Axel Beckert Date: Sun, 20 Dec 2020 08:47:31 +0100 Subject: [PATCH] Fix test suite failures in a Sid chroot Problem was that the commented variant only was a new, $dist-security one, but is also written if the security repo is disabled with other distributions than sid/unstable. --- hooks/debian/20-setup-apt | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/hooks/debian/20-setup-apt b/hooks/debian/20-setup-apt index e495632..1bcdec8 100755 --- a/hooks/debian/20-setup-apt +++ b/hooks/debian/20-setup-apt @@ -89,7 +89,20 @@ E_O_APT fi else - cat <> ${prefix}/etc/apt/sources.list + + if echo "${dist}" | egrep -q '\b(sarge|etch|lenny|squeeze|wheezyjessie|stretch|buster)\b'; then + + cat <> ${prefix}/etc/apt/sources.list +# +# Security updates - Uncomment to enable. +# +# deb http://security.debian.org/ ${dist}/updates main contrib non-free +# deb-src http://security.debian.org/ ${dist}/updates main contrib non-free +E_O_APT + + else + + cat <> ${prefix}/etc/apt/sources.list # # Security updates - Uncomment to enable. # @@ -97,6 +110,7 @@ else # deb-src http://security.debian.org/ ${dist}-security main contrib non-free E_O_APT + fi fi #