Commit 273eea7b authored by Francois-Rene Rideau's avatar Francois-Rene Rideau

2.012.7: Properly parse the pathname specification of defsystem. Hopefully addresses lp#732317

parent 82e48f87
......@@ -12,7 +12,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "2.012.6" ;; to be automatically updated by bin/bump-revision
:version "2.012.7" ;; to be automatically updated by bin/bump-revision
:depends-on ()
:components
((:file "asdf")
......
;;; -*- mode: common-lisp; package: asdf; -*-
;;; This is ASDF 2.012.6: Another System Definition Facility.
;;; This is ASDF 2.012.7: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......@@ -83,7 +83,7 @@
;; "2.345.6" would be a development version in the official upstream
;; "2.345.0.7" would be your seventh local modification of official release 2.345
;; "2.345.6.7" would be your seventh local modification of development version 2.345.6
(asdf-version "2.012.6")
(asdf-version "2.012.7")
(existing-asdf (fboundp 'find-system))
(existing-version *asdf-version*)
(already-there (equal asdf-version existing-version)))
......@@ -2210,7 +2210,9 @@ details."
;; 3. taken from the *default-pathname-defaults* via default-directory
(let* ((file-pathname (load-pathname))
(directory-pathname (and file-pathname (pathname-directory-pathname file-pathname))))
(or (and pathname-supplied-p (merge-pathnames* pathname directory-pathname))
(or (and pathname-supplied-p
(merge-pathnames* (merge-component-name-type pathname :type :directory)
directory-pathname))
directory-pathname
(default-directory))))
......
Markdown is supported
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