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

1.622: a fix for component-relative-pathname to somehow work with logical pathname hosts.

(Thanks to janderson for the bug report and patch.)
parent e1732766
No related branches found
No related tags found
No related merge requests found
...@@ -208,7 +208,7 @@ ...@@ -208,7 +208,7 @@
;; This parameter isn't actually user-visible ;; This parameter isn't actually user-visible
;; -- please use the exported function ASDF:ASDF-VERSION below. ;; -- please use the exported function ASDF:ASDF-VERSION below.
;; the 1+ hair is to ensure that we don't do an inadvertent find and replace ;; the 1+ hair is to ensure that we don't do an inadvertent find and replace
(subseq "VERSION:1.620" (1+ (length "VERSION")))) (subseq "VERSION:1.622" (1+ (length "VERSION"))))
(defun asdf-version () (defun asdf-version ()
"Exported interface to the version of ASDF currently installed. A string. "Exported interface to the version of ASDF currently installed. A string.
...@@ -1028,10 +1028,15 @@ to `~a` which is not a directory.~@:>" ...@@ -1028,10 +1028,15 @@ to `~a` which is not a directory.~@:>"
filename)))) filename))))
(defmethod component-relative-pathname ((component source-file)) (defmethod component-relative-pathname ((component source-file))
(merge-component-relative-pathname ;; This binding of *default-pathname-defaults* is required notably because
(slot-value component 'relative-pathname) ;; it will provide the default host to the above make-pathname, which may
(component-name component) ;; crucially matter to e.g. people somehow using logical-pathnames.
(source-file-type component (component-system component)))) (let ((*default-pathname-defaults*
(component-pathname (component-parent component))))
(merge-component-relative-pathname
(slot-value component 'relative-pathname)
(component-name component)
(source-file-type component (component-system component)))))
;;;; ------------------------------------------------------------------------- ;;;; -------------------------------------------------------------------------
;;;; Operations ;;;; Operations
......
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