diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2024-05-09 18:28:00 +0100 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2024-05-09 18:28:00 +0100 |
| commit | 03439c59e3fd19f3948cbdc8cd1f3db454287d14 (patch) | |
| tree | 690b32263dbe3db43c9a79cf94eeda6c492a7e55 | |
| parent | ffd944da0bab30dd74e44aa5153ae4c1556ae9f5 (diff) | |
| download | consfigurator-03439c59e3fd19f3948cbdc8cd1f3db454287d14.tar.gz | |
APT:STANDARD-SOURCES-FOR: don't try to add old *-backports sources
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | doc/news.rst | 5 | ||||
| -rw-r--r-- | src/property/apt.lisp | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/doc/news.rst b/doc/news.rst index d4b19f1..2b66648 100644 --- a/doc/news.rst +++ b/doc/news.rst @@ -23,13 +23,16 @@ In summary, you should always be able to upgrade to a release which only increments ``patch``, but if either of the other two components have changed, you should review this document and see if your consfig needs updating. -1.3.3 (unreleased) +1.4.0 (unreleased) ------------------ - APACHE:HTTPS-VHOST now adds an Apache ``<Directory>`` directive which ensures that HTTP access to the ``.well-known/acme-challenge/`` subdirectory of the document root is granted. +- APT:STANDARD-SOURCES-FOR will not try to add *-backports sources for stable + releases whose *-backports dists are gone from the official Debian mirrors. + 1.3.2 (2024-04-24) ------------------ diff --git a/src/property/apt.lisp b/src/property/apt.lisp index 11367d2..d3112e2 100644 --- a/src/property/apt.lisp +++ b/src/property/apt.lisp @@ -284,13 +284,14 @@ only upgrade Debian stable." (mapcar (lambda (m) (list* m #?"${suite}-updates" +sections+)) (get-mirrors)))) + (old-suite-p (memstr= suite '("stretch" "jessie" "buster"))) (backports (and (subtypep (type-of os) 'os:debian-stable) + (not old-suite-p) (mapcar (lambda (m) (list* m #?"${suite}-backports" +sections+)) (get-mirrors)))) - (security-suite (if (memstr= suite '("stretch" "jessie" "buster")) - #?"${suite}/updates" - #?"${suite}-security")) + (security-suite + (if old-suite-p #?"${suite}/updates" #?"${suite}-security")) (security (and (or (subtypep (type-of os) 'os:debian-stable) (subtypep (type-of os) 'os:debian-testing)) (list |