From a40e5d22354615f13d69d963cbe9c727babc724c Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Fri, 12 Jul 2019 14:19:27 -0400 Subject: use "-security" suffix for bullseye and up The suite for stable releases from bullseye on will be suffixed with "-security". Only 3 past stable releases continue to use the old unsuffixed name. --- debian/changelog | 2 ++ src/Propellor/Property/Apt.hs | 5 ++++- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 3298bae7..0f51140a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ propellor (5.9.1) UNRELEASED; urgency=medium * Apt: Debian has changed the name of the suite for testing security updates from testing to testing-security. + * Apt: Also the suite for stable releases from bullseye on will be + suffixed with "-security". -- Joey Hess Wed, 10 Jul 2019 22:02:35 -0400 diff --git a/src/Propellor/Property/Apt.hs b/src/Propellor/Property/Apt.hs index 41e6cfe7..68927337 100644 --- a/src/Propellor/Property/Apt.hs +++ b/src/Propellor/Property/Apt.hs @@ -116,7 +116,10 @@ securityUpdates suite where securitysuite | suite == Testing = "testing-security" - | otherwise = showSuite suite + | suite `elem` map Stable releasesusingoldname = + showSuite suite + | otherwise = showSuite suite ++ "-security" + releasesusingoldname = ["jessie", "buster", "stretch"] -- | Makes sources.list have a standard content using the Debian mirror CDN -- (or other host specified using the `mirror` property), with the -- cgit v1.2.3