From 3019bfea87ab6df33845f3bf7f7df03a33a5970d Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Sat, 16 Apr 2022 15:38:15 -0700 Subject: convert PACKAGE:*CONSFIGURATOR-SYSTEM-DEPENDENCIES* to a constant Signed-off-by: Sean Whitton --- src/connection/sbcl.lisp | 2 +- src/package.lisp | 2 +- src/property/package.lisp | 7 ++++--- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/src/connection/sbcl.lisp b/src/connection/sbcl.lisp index 4fad603..184c30d 100644 --- a/src/connection/sbcl.lisp +++ b/src/connection/sbcl.lisp @@ -39,7 +39,7 @@ recommended.")) (unless (and package-manager-supplied-p (not package-manager)) (handler-case (package:installed package-manager '(:apt "sbcl") - package:*consfigurator-system-dependencies*) + package:+consfigurator-system-dependencies+) ;; If we couldn't find any package manager on PATH, just proceed in the ;; hope that everything we need is already installed; we'll find out ;; whether it's actually a problem pretty quickly, when the remote SBCL diff --git a/src/package.lisp b/src/package.lisp index 3499491..df06609 100644 --- a/src/package.lisp +++ b/src/package.lisp @@ -534,7 +534,7 @@ (package :consfigurator.property.package (:local-nicknames (#:apt #:consfigurator.property.apt)) - (:export #:*consfigurator-system-dependencies* + (:export #:+consfigurator-system-dependencies+ #:package-manager-not-found #:installed)) diff --git a/src/property/package.lisp b/src/property/package.lisp index c4bb24c..7244d51 100644 --- a/src/property/package.lisp +++ b/src/property/package.lisp @@ -18,8 +18,9 @@ (in-package :consfigurator.property.package) (named-readtables:in-readtable :consfigurator) -(defparameter *consfigurator-system-dependencies* - '(:apt ("build-essential" "libacl1-dev" "libcap-dev"))) +(define-constant +consfigurator-system-dependencies+ + '(:apt ("build-essential" "libacl1-dev" "libcap-dev")) + :test #'equal) (defgeneric %command (package-manager) (:documentation @@ -54,7 +55,7 @@ particular package manager; otherwise, see what we can find on PATH. Each of PACKAGE-LISTS is a plist where the keys identify package managers, and where the values are lists of package names to install using that package -manager. See PACKAGE:*CONSFIGURATOR-SYSTEM-DEPENDENCIES* for an example. +manager. See PACKAGE:+CONSFIGURATOR-SYSTEM-DEPENDENCIES+ for an example. This property should not typically be applied to hosts. It is preferable to use an operating system-specific property, such as APT:INSTALLED. This -- cgit v1.2.3