Commit 8fd3c6dc authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

Fix typo in 0c95742b that broke ASDF.

Also, reformat a function and use uiop implicitly.
parent 69738939
...@@ -199,7 +199,7 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms.")) ...@@ -199,7 +199,7 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms."))
(defmethod resolve-dependency-combination (component (combinator (eql :require)) arguments) (defmethod resolve-dependency-combination (component (combinator (eql :require)) arguments)
(unless (and (length=n-p arguments 1) (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~@:>") (error (compatfmt "~@<Bad dependency ~S for ~S. ~S takes one argument, a string or non-null symbol~@:>")
(cons combinator arguments) component combinator)) (cons combinator arguments) component combinator))
;; :require must be prepared for some implementations providing modules using ASDF, ;; :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.")) ...@@ -230,9 +230,10 @@ the implementation's REQUIRE rather than by internal ASDF mechanisms."))
(handler-bind (handler-bind
((style-warning #'muffle-warning) ((style-warning #'muffle-warning)
(missing-component (constantly nil)) (missing-component (constantly nil))
(uiop:fatal-condition #'(lambda (e) (fatal-condition
(format *error-output* (compatfmt "~@<ASDF could not load ~(~A~) because ~A.~@:>~%") #'(lambda (e)
name e)))) (format *error-output* (compatfmt "~@<ASDF could not load ~(~A~) because ~A.~@:>~%")
name e))))
(let ((*verbose-out* (make-broadcast-stream))) (let ((*verbose-out* (make-broadcast-stream)))
(let ((system (find-system module nil))) (let ((system (find-system module nil)))
(when system (when system
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment