Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix installation failure due to an error when reading ASD files #257

Merged
merged 2 commits into from
Jul 16, 2024
Merged

Fix installation failure due to an error when reading ASD files #257

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
28493bc
Skip ASD files on errors while determining dependencies (`systems.txt`).
fukamachi Jul 16, 2024
83ec13b
Fix a style-warning.
fukamachi Jul 16, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 9 additions & 0 deletions src/logger.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
#:whisper
#:clear-whisper
#:message
#:warn-message
#:debug-log))
(in-package #:qlot/logger)

Expand Down Expand Up @@ -57,6 +58,14 @@
(write-char #\Newline out))
(values))

(defun warn-message (format-control &rest format-arguments)
(let ((out *logger-message-stream*)
(text (apply #'format nil format-control format-arguments)))
(clear-whisper)
(write-string (color-text :yellow text) out)
(write-char #\Newline out))
(values))

(defun debug-log (format-control &rest format-arguments)
(when *debug*
(clear-whisper)
Expand Down
21 changes: 14 additions & 7 deletions src/utils/asdf.lisp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,8 @@
#:starts-with
#:with-package-functions)
(:import-from #:qlot/logger
#:*debug*)
#:*debug*
#:warn-message)
(:export #:with-autoload-on-missing
#:directory-system-files
#:system-class-name
Expand Down Expand Up @@ -167,8 +168,7 @@
(error c))
(asdf:missing-dependency (c)
(with-package-functions #:ql-dist (ensure-installed find-system)
(let ((parent (asdf::missing-required-by c))
(missing (asdf::missing-requires c)))
(let ((missing (asdf::missing-requires c)))
(if (gethash missing tried-so-far)
(error "Dependency looping -- already tried to load ~A" missing)
(setf (gethash missing tried-so-far) missing))
Expand All @@ -192,12 +192,19 @@
`(with-traversal-context
(let ((,dir-system-files (directory-system-files ,directory)))
(dolist (,system-file ,dir-system-files)
(handler-bind ((style-warning #'muffle-warning))
(read-asd-file ,system-file
:eval-form ,eval-form)))
(handler-case
(handler-bind ((style-warning #'muffle-warning))
(read-asd-file ,system-file
:eval-form ,eval-form))
(error (c)
(warn-message "Failed to calculate dependencies for '~A' due to an error while loading it."
(file-namestring ,system-file))
(when *debug*
(warn-message " ~A~%" c)))))
(dolist (,system-file ,dir-system-files)
(declare (ignorable ,system-file))
(let ((,value (gethash ,system-file *registry*)))
(let ((,value (or (gethash ,system-file *registry*)
(list (list (pathname-name ,system-file))))))
(dolist (,value ,value)
(destructuring-bind (,system-name &rest ,dependencies) ,value
(declare (ignorable ,system-name ,dependencies))
Expand Down
Loading