aboutsummaryrefslogtreecommitdiff
path: root/src/property/apt.lisp
diff options
context:
space:
mode:
authorSean Whitton <spwhitton@spwhitton.name>2021-08-27 14:32:16 -0700
committerSean Whitton <spwhitton@spwhitton.name>2021-08-31 15:30:50 -0700
commitab469268b42d8fc8b0a180990be40e925a65935a (patch)
tree3b18ccc1fc99dfeded420634b4e529e1203881e1 /src/property/apt.lisp
parent7e72e55e996b29ba775e6695ee1f85ce637dc90a (diff)
downloadconsfigurator-ab469268b42d8fc8b0a180990be40e925a65935a.tar.gz
rework PUSHNEW-HOSTATTRS to use EQUAL not EQL & add PUSHNEW-HOSTATTR
Previously, PUSHNEW-HOSTATTRS always used EQL to determine whether a hostattr was already pushed, which would give the wrong answer for many common cases. Now default to using EQUAL, and provide a way for the caller to specify the test function. PUSHNEW-HOSTATTRS now takes a list of hostattrs as a single parameter, rather than using &REST, in order to make room for the new :TEST keyword parameter. To mitigate the inconvenience of no longer using &REST, add PUSHNEW-HOSTATTR. Also fix some parameter and function names in docstrings. Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
Diffstat (limited to 'src/property/apt.lisp')
-rw-r--r--src/property/apt.lisp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/property/apt.lisp b/src/property/apt.lisp
index cd0e938..2197148 100644
--- a/src/property/apt.lisp
+++ b/src/property/apt.lisp
@@ -163,7 +163,7 @@ only upgrade Debian stable."
(defprop mirror :posix (uri)
(:desc #?"${uri} apt mirror selected")
(:hostattrs
- (pushnew-hostattrs :apt.mirror uri)))
+ (pushnew-hostattr :apt.mirror uri)))
(defpropspec uses-parent-mirrors :posix ()
(:desc #?"Uses parent's apt mirror(s), if any")
@@ -175,7 +175,7 @@ only upgrade Debian stable."
(defprop proxy :posix (uri)
(:desc #?"${uri} apt proxy selected")
(:hostattrs
- (pushnew-hostattrs :apt.proxy uri))
+ (pushnew-hostattr :apt.proxy uri))
(:apply
(file:has-content "/etc/apt/apt.conf.d/20proxy"
(format nil "Acquire::HTTP::Proxy \"~A\";~%" uri))))