From 3a13e374169586f53a20a52f3584b342626792db Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Tue, 23 Mar 2021 12:11:39 -0700 Subject: simplify definition of MISSING-DATA-SOURCE Signed-off-by: Sean Whitton --- src/data.lisp | 6 +----- src/data/pgp.lisp | 5 ++--- 2 files changed, 3 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/data.lisp b/src/data.lisp index 3b9676f..3dfc2da 100644 --- a/src/data.lisp +++ b/src/data.lisp @@ -89,11 +89,7 @@ Signals a condition MISSING-DATA-SOURCE when unable to access the data source all new Lisp images started up by Consfigurator, since prerequisite data sources are not expected to be available outside of the root Lisp.")) -(define-condition missing-data-source (error) - ((text :initarg :text :reader missing-data-source-text)) - (:report (lambda (condition stream) - (format stream "Missing data source: ~A" - (missing-data-source-text condition))))) +(define-simple-error missing-data-source) (defvar *data-sources* nil "Known sources of prerequisite data.") diff --git a/src/data/pgp.lisp b/src/data/pgp.lisp index a6b9339..05ac255 100644 --- a/src/data/pgp.lisp +++ b/src/data/pgp.lisp @@ -57,9 +57,8 @@ (escape-sh-command (list "gpg" "--decrypt" (unix-namestring location))) :output :string)) (subprocess-error (error) - (error 'missing-data-source - :text (format nil "While attempt to decrypt, gpg exited with ~A" - (uiop:subprocess-error-code error)))))) + (missing-data-source "While attempt to decrypt, gpg exited with ~A" + (uiop:subprocess-error-code error))))) (defun put-store (location data) (run-program (list "gpg" "--encrypt") -- cgit v1.2.3