diff options
| author | Sean Whitton <spwhitton@spwhitton.name> | 2021-06-18 11:40:24 -0700 |
|---|---|---|
| committer | Sean Whitton <spwhitton@spwhitton.name> | 2021-06-18 11:40:24 -0700 |
| commit | d835070f706e341cb3dd3daee5cb7a7d31c0c4da (patch) | |
| tree | 03bfa627d591af9ca4cdc39811bd0dd2e8f9b07a | |
| parent | e543366cf23caeca534e687d5aae89b1300c1359 (diff) | |
| download | consfigurator-d835070f706e341cb3dd3daee5cb7a7d31c0c4da.tar.gz | |
replace APT:USE-PARENT-MIRROR with APT:USE-PARENT-MIRRORS
Signed-off-by: Sean Whitton <spwhitton@spwhitton.name>
| -rw-r--r-- | doc/introduction.rst | 2 | ||||
| -rw-r--r-- | src/package.lisp | 2 | ||||
| -rw-r--r-- | src/property/apt.lisp | 10 | ||||
| -rw-r--r-- | src/property/sbuild.lisp | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/doc/introduction.rst b/doc/introduction.rst index 4275996..b6d2f0c 100644 --- a/doc/introduction.rst +++ b/doc/introduction.rst @@ -83,7 +83,7 @@ Try it out / quick start ;; These two properties are not for debootstrap(1) for but apt ;; inside the chroot. (apt:uses-parent-proxy) ; use the apt-cacher-ng set up outside chroot - (apt:uses-parent-mirror))) ; use the apt mirror set up above + (apt:uses-parent-mirrors))) ; use the apt mirror set up above Here, "spwhitton" is my username on athena; we have to tell Consfigurator what user it will be when it tries to sudo, so it knows whose password it diff --git a/src/package.lisp b/src/package.lisp index 689116d..cc0a6b0 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -381,7 +381,7 @@ #:periodic-updates #:unattended-upgrades #:mirror - #:uses-parent-mirror + #:uses-parent-mirrors #:proxy #:uses-parent-proxy #:uses-local-cacher diff --git a/src/property/apt.lisp b/src/property/apt.lisp index dbdcbf2..cb62df4 100644 --- a/src/property/apt.lisp +++ b/src/property/apt.lisp @@ -162,10 +162,12 @@ only upgrade Debian stable." (:hostattrs (pushnew-hostattrs :apt.mirror uri))) -(defproplist uses-parent-mirror :posix () - (:desc #?"Uses parent's apt mirror") - (mirror (or (get-parent-hostattrs-car :apt.mirror) - (failed-change "Parent has no apt mirror")))) +(defpropspec uses-parent-mirrors :posix () + (:desc #?"Uses parent's apt mirror(s), if any") + (let ((mirrors (get-parent-hostattrs :apt-mirror))) + (and mirrors + `(eseqprops + ,@(loop for mirror in mirrors collect `(mirror ,mirror)))))) (defprop proxy :posix (uri) (:desc #?"${uri} apt proxy selected") diff --git a/src/property/sbuild.lisp b/src/property/sbuild.lisp index 4eca68f..f6f5bbf 100644 --- a/src/property/sbuild.lisp +++ b/src/property/sbuild.lisp @@ -80,7 +80,7 @@ Example usage: (os:debian-unstable :amd64) (sbuild:standard-debian-schroot) (apt:uses-parent-proxy) - (apt:uses-parent-mirror)) + (apt:uses-parent-mirrors)) To take advantage of the piuparts and autopkgtest support, add to your ~/.sbuildrc: |