From b8b4ce70653323850a3fb257159ae35eff071ab4 Mon Sep 17 00:00:00 2001 From: Sean Whitton Date: Mon, 15 Mar 2021 16:11:51 -0700 Subject: don't ever try to load ASDF systems Preprocessing a propspec will catch undefined properties and property combinators, and we only eval preprocessed propspecs, so there is no point in doing this anymore. We still need the list of ASDF systems to know what to upload. Signed-off-by: Sean Whitton --- src/data.lisp | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) (limited to 'src/data.lisp') diff --git a/src/data.lisp b/src/data.lisp index b28a24a..0ea673b 100644 --- a/src/data.lisp +++ b/src/data.lisp @@ -371,20 +371,13 @@ Preprocessing must occur in the root Lisp.")) (lambda (c) (declare (ignore c)) (invoke-restart 'skip-data-source)))) - ;; don't try to load systems as we don't upload the .asd files, - ;; and we don't want to load out of /usr/share/common-lisp or - ;; something as we might get a different version of the library - ;; at worst, or a lot of redefinition warnings at best - (let ((*suppress-loading-systems* t)) - ,@forms)))) + ,@forms))) (let* ((intern-forms (loop for name in '("MISSING-DATA-SOURCE" - "SKIP-DATA-SOURCE" - "*SUPPRESS-LOADING-SYSTEMS*") + "SKIP-DATA-SOURCE") collect `(export (intern ,name (find-package "CONSFIGURATOR")) (find-package "CONSFIGURATOR")))) - (proclamations `((proclaim '(special *suppress-loading-systems*)))) (load-forms (loop for system in (slot-value (slot-value *host* 'propspec) 'systems) @@ -397,7 +390,6 @@ Preprocessing must occur in the root Lisp.")) (slot-value *connection* 'cached-data)))))) (forms `((make-package "CONSFIGURATOR") ,@intern-forms - ,@proclamations (define-condition missing-data-source (error) ()) (require "asdf") (let ((*standard-output* *error-output*)) -- cgit v1.2.3