Commit 1d4a70fb authored by Mark's avatar Mark
Browse files

asdf- fix loading asdf systems from jars

Under ABCL, when loading system definitions from a JAR-PATHNAME, the
PARSE-UNIX-NAMESTRING was including the DEVICE in the defaults to
MAKE-PATHNAME.  This was mostly harmless but fails when (the as yet
unlrelease abcl-1.8.1) tightened the definition of JAR-PATHNAME to
always have an absolute directory
parent b08218d0
......@@ -1807,7 +1807,7 @@ form suitable for testing with #+."
(in-package :uiop/version)
(with-upgradability ()
(defparameter *uiop-version* "3.3.5")
(defparameter *uiop-version* "")
(defun unparse-version (version-list)
"From a parsed version (a list of natural numbers), compute the version string"
......@@ -2836,6 +2836,8 @@ with those keys, removing TYPE DEFAULTS and DOT-DOT.
When you're manipulating pathnames that are supposed to make sense portably
even though the OS may not be Unixish, we recommend you use :WANT-RELATIVE T
to throw an error if the pathname is absolute"
#+(or abcl mcl)
(declare (ignore defaults))
(block nil
(check-type type (or null string (eql :directory)))
(when ensure-directory
......@@ -2860,7 +2862,7 @@ to throw an error if the pathname is absolute"
:directory (unless file-only (cons relative path))
:name name :type type
:defaults (or #-mcl defaults *nil-pathname*))
:defaults (or #-(or abcl mcl) defaults *nil-pathname*))
(remove-plist-keys '(:type :dot-dot :defaults) keys))))))
(defun unix-namestring (pathname)
......@@ -7808,7 +7810,7 @@ previously-loaded version of ASDF."
;; "" would be a development version in the official branch, on top of 3.4.5.
;; "" would be your eighth local modification of official release 3.4.5
;; "" would be your eighth local modification of development version
(asdf-version "3.3.5")
(asdf-version "")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version)))
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment