Handle missing directories in bundles.

Author: xach

quicklisp/bundle-template.lisp

@@ -116,7 +116,7 @@
               (make-table :data-source (relative "local-projects/")
                           :init-function #'initialize-local-projects-table)))
 
-           (=matching-data-sources (&rest tables)
+           (=matching-data-sources (tables)
              (let ((data-sources (mapcar #'data-source tables)))
                (lambda (table)
                  (member (data-source table) data-sources
@@ -143,18 +143,18 @@
 
     (let ((existing (check-for-existing-searcher
                      asdf:*system-definition-search-functions*)))
-      (let* ((bundled (make-bundled-systems-table))
+      (let* ((local (make-local-projects-table))
              (bundled-local-projects
               (make-bundled-local-projects-systems-table))
-             (local (make-local-projects-table))
+             (bundled (make-bundled-systems-table))
+             (new-tables (remove nil (list local
+                                           bundled-local-projects
+                                           bundled)))
              (existing-tables (get searcher-name indicator))
-             (filter (=matching-data-sources bundled local)))
+             (filter (=matching-data-sources new-tables)))
         (setf (get searcher-name indicator)
-              (remove nil (list* local bundled-local-projects bundled
-                                 (delete-if filter existing-tables))))
-        (clear-asdf local)
-        (clear-asdf bundled-local-projects)
-        (clear-asdf bundled))
+              (append new-tables (delete-if filter existing-tables)))
+        (map nil #'clear-asdf new-tables))
       (unless existing
         (setf (symbol-function searcher-name) #'search-function)
         (push searcher-name asdf:*system-definition-search-functions*)))