2.26.122: Fix logical pathname issue on clisp

diff --git a/asdf.asd b/asdf.asd
index 6726c76..a9c4bba 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.121" ;; to be automatically updated by bin/bump-revision
+  :version "2.26.122" ;; 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 asdf/defsystem))))

diff --git a/find-system.lisp b/find-system.lisp
index 107c8bc..5d3e7a3 100644 (file)
--- a/find-system.lisp
+++ b/find-system.lisp
@@ -311,7 +311,11 @@ PREVIOUS-TIME when not null is the time at which the PREVIOUS system was loaded.
                 (setf (system-source-file system) pathname))
               (when (and pathname
                          (not (and previous
-                                   (pathname-equal pathname previous-pathname)
+                                   (or (pathname-equal pathname previous-pathname)
+                                       (and pathname previous-pathname
+                                            (pathname-equal
+                                             (translate-logical-pathname pathname)
+                                             (translate-logical-pathname previous-pathname))))
                                    (stamp<= (safe-file-write-date pathname) previous-time))))
                 ;; only load when it's a pathname that is different or has newer content
                 (load-sysdef name pathname)))

diff --git a/header.lisp b/header.lisp
index 0d715b1..f48947a 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.121: Another System Definition Facility.
+;;; This is ASDF 2.26.122: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.

diff --git a/test/test-logical-pathname.script b/test/test-logical-pathname.script
index a182fc2..d9bea36 100644 (file)
--- a/test/test-logical-pathname.script
+++ b/test/test-logical-pathname.script
@@ -52,7 +52,7 @@
        :ignore-inherited-configuration))
     (load-system :test-logical-pathname :force t)
     (let ((sys (find-system :test-logical-pathname)))
-      (assert (logical-pathname-p (component-pathname sys)))
-      (assert (logical-pathname-p (system-source-file sys)))))
+      #-clisp (assert (logical-pathname-p (component-pathname sys)))
+      #-clisp (assert (logical-pathname-p (system-source-file sys)))))
 
   (DBG "Done"))

diff --git a/upgrade.lisp b/upgrade.lisp
index 936650d..a4567af 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.121")
+         (asdf-version "2.26.122")
          (existing-asdf (find-class (find-symbol* :component :asdf nil) nil))
          (existing-version *asdf-version*)
          (already-there (equal asdf-version existing-version)))

diff --git a/version.lisp-expr b/version.lisp-expr
index ed17978..761fa61 100644 (file)
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.121"
+"2.26.122"