Skip to content
Snippets Groups Projects
Commit a65d0e2f authored by Francois-Rene Rideau's avatar Francois-Rene Rideau
Browse files

2.107: have ensure-source-registry accept a parameter (thanks, Xach)

parent b011e629
No related branches found
No related tags found
No related merge requests found
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
(eval-when (:load-toplevel :compile-toplevel :execute) (eval-when (:load-toplevel :compile-toplevel :execute)
(let* ((asdf-version ;; the 1+ helps the version bumping script discriminate (let* ((asdf-version ;; the 1+ helps the version bumping script discriminate
(subseq "VERSION:2.106" (1+ (length "VERSION")))) (subseq "VERSION:2.107" (1+ (length "VERSION"))))
(existing-asdf (find-package :asdf)) (existing-asdf (find-package :asdf))
(vername '#:*asdf-version*) (vername '#:*asdf-version*)
(versym (and existing-asdf (versym (and existing-asdf
...@@ -3355,14 +3355,18 @@ with a different configuration, so the configuration would be re-read then." ...@@ -3355,14 +3355,18 @@ with a different configuration, so the configuration would be re-read then."
(defun initialize-source-registry (&optional parameter) (defun initialize-source-registry (&optional parameter)
(setf (source-registry) (compute-source-registry parameter))) (setf (source-registry) (compute-source-registry parameter)))
;; checks an initial variable to see whether the state is initialized ;; Checks an initial variable to see whether the state is initialized
;; or cleared. In the former case, return current configuration; in ;; or cleared. In the former case, return current configuration; in
;; the latter, initialize. ASDF will call this function at the start ;; the latter, initialize. ASDF will call this function at the start
;; of (asdf:find-system). ;; of (asdf:find-system) to make sure the source registry is initialized.
(defun ensure-source-registry () ;; However, it will do so *without* a parameter, at which point it
;; will be too late to provide a parameter to this function, though
;; you may override the configuration explicitly by calling
;; initialize-source-registry directly with your parameter.
(defun ensure-source-registry (&optional parameter)
(if (source-registry-initialized-p) (if (source-registry-initialized-p)
(source-registry) (source-registry)
(initialize-source-registry))) (initialize-source-registry parameter)))
(defun sysdef-source-registry-search (system) (defun sysdef-source-registry-search (system)
(ensure-source-registry) (ensure-source-registry)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment