2.26.115: more fixes to version access. Now works with POIU 1.29.6.

diff --git a/asdf.asd b/asdf.asd
index 02d15b0..e408d9f 100644 (file)
--- 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 6920361..2b00b4a 100644 (file)
--- 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 "~@<Invalid version ~S for component ~S~@[ of ~S~]~@:>")
-                  version name parent))
-          (setf (component-version component) version)))
+        (setf version (normalize-version version sysdir)))
+      (when (and versionp (not (parse-version version nil)))
+        (warn (compatfmt "~@<Invalid version ~S for component ~S~@[ of ~S~]~@:>")
+              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 1d40043..b11c6b6 100644 (file)
--- 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 <asdf-devel@common-lisp.net>.

diff --git a/upgrade.lisp b/upgrade.lisp
index 81b9478..a744d1d 100644 (file)
--- 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 1fb9526..4b10440 100644 (file)
--- 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 4a80d39..86dcaf2 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.114"
+"2.26.115"