diff --git a/asdf.asd b/asdf.asd index 02d15b0af09c9bd9df6898168508988519c76169..e408d9f287d7dfa705ff3db83d55db296be9d54c 100644 --- a/asdf.asd +++ b/asdf.asd @@ -15,7 +15,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.26.114" ;; to be automatically updated by bin/bump-revision + :version "2.26.115" ;; to be automatically updated by bin/bump-revision :depends-on () :components ((:module "build" :components ((:file "asdf")))) :in-order-to (#+asdf2.27 (compile-op (monolithic-load-concatenated-source-op generate-asdf)))) diff --git a/defsystem.lisp b/defsystem.lisp index 692036122a9659dfcf1483ce66b870653fd2f021..2b00b4a0ea550801a0bd741ba44bd87619d738b1 100644 --- a/defsystem.lisp +++ b/defsystem.lisp @@ -136,12 +136,11 @@ (setf component (apply 'make-instance (class-for-type parent type) args))) (component-pathname component) ; eagerly compute the absolute pathname (let ((sysdir (system-source-directory (component-system component)))) ;; requires the previous - (when versionp - (setf version (normalize-version version sysdir)) - (unless (parse-version version nil) - (warn (compatfmt "~@") - version name parent)) - (setf (component-version component) version))) + (setf version (normalize-version version sysdir))) + (when (and versionp (not (parse-version version nil))) + (warn (compatfmt "~@") + version name parent)) + (setf (component-version component) version) (when (typep component 'parent-component) (setf (component-children component) (loop diff --git a/header.lisp b/header.lisp index 1d40043f0d35000c983f3156946abd67b3653b42..b11c6b6907a9ecef56292add335bbbb9d0cda9a2 100644 --- a/header.lisp +++ b/header.lisp @@ -1,5 +1,5 @@ ;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; coding: utf-8 -*- -;;; This is ASDF 2.26.114: Another System Definition Facility. +;;; This is ASDF 2.26.115: Another System Definition Facility. ;;; ;;; Feedback, bug reports, and patches are all welcome: ;;; please mail to . diff --git a/upgrade.lisp b/upgrade.lisp index 81b9478996d65e1eac26fa735a253498e55eb311..a744d1d7ac765398c859aa0f731f1c65be7bec12 100644 --- a/upgrade.lisp +++ b/upgrade.lisp @@ -45,7 +45,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.26.114") + (asdf-version "2.26.115") (existing-asdf (find-class (find-symbol* :component :asdf nil) nil)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) diff --git a/utility.lisp b/utility.lisp index 1fb95265a7442f743171c12acc719929c97b094f..4b104404ed7f4117f556c0bff5f19da361d362b9 100644 --- a/utility.lisp +++ b/utility.lisp @@ -267,7 +267,7 @@ As a degenerate case, the PATH may be an atom of a single such accessor instead of a list." (flet ((access (object accessor) (etypecase accessor - (integer (elt object path)) + (integer (elt object accessor)) ((or function symbol) (funcall accessor object)) (cons (funcall (ensure-function accessor) object))))) (if (listp path) diff --git a/version.lisp-expr b/version.lisp-expr index 4a80d3979f3f74f4a98b954fbadfe053c72d0259..86dcaf2cf3e22da6fd5a81d26ae639af188dfec2 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -1 +1 @@ -"2.26.114" +"2.26.115"