From 8fd3c6dcebfc648121ab5cd11fae2cf9f8036dd8 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Sun, 11 Sep 2016 23:53:25 -0400 Subject: [PATCH] Fix typo in 0c95742 that broke ASDF. Also, reformat a function and use uiop implicitly. --- operate.lisp | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/operate.lisp b/operate.lisp index 0d994817b..0d86b757a 100644 --- a/operate.lisp +++ b/operate.lisp @@ -199,7 +199,7 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms.")) (defmethod resolve-dependency-combination (component (combinator (eql :require)) arguments) (unless (and (length=n-p arguments 1) - (typep (car argument) '(or string (and symbol (not null))))) + (typep (car arguments) '(or string (and symbol (not null))))) (error (compatfmt "~@<Bad dependency ~S for ~S. ~S takes one argument, a string or non-null symbol~@:>") (cons combinator arguments) component combinator)) ;; :require must be prepared for some implementations providing modules using ASDF, @@ -230,9 +230,10 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms.")) (handler-bind ((style-warning #'muffle-warning) (missing-component (constantly nil)) - (uiop:fatal-condition #'(lambda (e) - (format *error-output* (compatfmt "~@<ASDF could not load ~(~A~) because ~A.~@:>~%") - name e)))) + (fatal-condition + #'(lambda (e) + (format *error-output* (compatfmt "~@<ASDF could not load ~(~A~) because ~A.~@:>~%") + name e)))) (let ((*verbose-out* (make-broadcast-stream))) (let ((system (find-system module nil))) (when system -- GitLab