Skip to content

Commit 2ef7c73

Browse files
committed
Update bundling to work with system failures.
First, consult a list of ignored systems to avoid failure on known-bad-for-bundling systems. That's just "asdf", for now. Second, add a restart for ignoring a system failure interactively (thanks to @dimitri). Fixes #116.
1 parent adaa1ed commit 2ef7c73

File tree

1 file changed

+9
-3
lines changed

1 file changed

+9
-3
lines changed

quicklisp/bundle.lisp

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -136,9 +136,15 @@
136136
(defun add-systems-recursively (names bundle)
137137
(with-consistent-dists
138138
(labels ((add-one (name)
139-
(let ((system (ensure-system name bundle)))
140-
(dolist (required-system-name (required-systems system))
141-
(add-one required-system-name)))))
139+
(unless (member name *ignored-systems* :test 'equalp)
140+
(let ((system
141+
(restart-case
142+
(ensure-system name bundle)
143+
(omit ()
144+
:report "Ignore this system and omit it from the bundle."))))
145+
(when system
146+
(dolist (required-system-name (required-systems system))
147+
(add-one required-system-name)))))))
142148
(map nil #'add-one names)))
143149
bundle)
144150

0 commit comments

Comments
 (0)