From b0b6708f3d0493a8c0b7bd3e0632373dbe1fc517 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Sat, 19 Jan 2013 15:09:34 -0500
Subject: [PATCH] 2.26.124: actually fix things on CMUCL and pass tests.

---
 action.lisp              | 11 +++++------
 asdf.asd                 |  2 +-
 bundle.lisp              |  2 +-
 header.lisp              |  2 +-
 plan.lisp                |  6 +++---
 test/script-support.lisp |  1 +
 upgrade.lisp             |  2 +-
 version.lisp-expr        |  2 +-
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/action.lisp b/action.lisp
index b57bf06b6..0c8e6b0c2 100644
--- a/action.lisp
+++ b/action.lisp
@@ -17,17 +17,16 @@
    #:action-status #:action-stamp #:action-done-p
    #:component-operation-time #:mark-operation-done #:compute-action-stamp
    #:perform #:perform-with-restarts #:retry #:accept #:feature
-   #:gather-actions #:required-components
-   #:traverse-sub-actions #:required-files
+   #:traverse-actions #:traverse-sub-actions #:required-components #:required-files ;; in plan
    ))
 (in-package :asdf/action)
 
 (deftype action () '(cons operation component)) ;; a step to be performed while building the system
 
-(defgeneric* traverse-actions (actions &key))
-(defgeneric* traverse-sub-actions (operation component &key))
-(defgeneric* required-components (component &key))
-(defgeneric* required-files (operation component &key))
+(defgeneric* traverse-actions (actions &key &allow-other-keys))
+(defgeneric* traverse-sub-actions (operation component &key &allow-other-keys))
+(defgeneric* required-components (component &key &allow-other-keys))
+(defgeneric* required-files (operation component &key &allow-other-keys))
 
 
 ;;;; Convenience methods
diff --git a/asdf.asd b/asdf.asd
index 3b592b0e5..b97c153c4 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.123" ;; to be automatically updated by bin/bump-revision
+  :version "2.26.124" ;; 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/bundle.lisp b/bundle.lisp
index a2efd1eb6..d70ecda3d 100644
--- a/bundle.lisp
+++ b/bundle.lisp
@@ -268,7 +268,7 @@
       `((,op ,c))
       (call-next-method)))
 
-(defun* required-files (o c &key (test 'identity) (key 'output-files))
+(defmethod required-files (o c &key (test 'identity) (key 'output-files) &allow-other-keys)
   (while-collecting (collect)
     (visit-dependencies
      () o c #'(lambda (sub-o sub-c)
diff --git a/header.lisp b/header.lisp
index 38fda3acb..eac91b05c 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.123: Another System Definition Facility.
+;;; This is ASDF 2.26.124: Another System Definition Facility.
 ;;;
 ;;; Feedback, bug reports, and patches are all welcome:
 ;;; please mail to <asdf-devel@common-lisp.net>.
diff --git a/plan.lisp b/plan.lisp
index aee70ddb9..62f67e05f 100644
--- a/plan.lisp
+++ b/plan.lisp
@@ -390,13 +390,13 @@ processed in order by OPERATE."))
        (typep c (plan-component-type plan))
        (call-next-method)))
 
-(defun* traverse-actions (actions &rest keys &key plan-class &allow-other-keys)
+(defmethod traverse-actions (actions &rest keys &key plan-class &allow-other-keys)
   (let ((plan (apply 'make-instance (or plan-class 'filtered-sequential-plan) keys)))
     (loop :for (o . c) :in actions :do
       (traverse-action plan o c t))
     (plan-actions plan)))
 
-(defun* traverse-sub-actions (operation component &rest keys)
+(defmethod traverse-sub-actions (operation component &rest keys &key &allow-other-keys)
   (apply 'traverse-actions (direct-dependencies operation component)
          :system (component-system component) keys))
 
@@ -407,7 +407,7 @@ processed in order by OPERATE."))
                    (typep c keep-component))
           :collect (cons o c))))
 
-(defun* required-components (system &rest keys &key (goal-operation 'load-op) &allow-other-keys)
+(defmethod required-components (system &rest keys &key (goal-operation 'load-op) &allow-other-keys)
   (remove-duplicates
    (mapcar 'cdr (apply 'traverse-sub-actions (make-operation goal-operation) system keys))
    :from-end t))
diff --git a/test/script-support.lisp b/test/script-support.lisp
index 32db7b1a0..e2cf8ea97 100644
--- a/test/script-support.lisp
+++ b/test/script-support.lisp
@@ -55,6 +55,7 @@ Some constraints:
         excl::*autoload-package-name-alist*
         (remove "asdf" excl::*autoload-package-name-alist*
                 :test 'equalp :key 'car)) ; We need that BEFORE any mention of package ASDF.
+  #+cmucl (setf ext:*gc-verbose* nil)
   #+gcl
   (when (or (< system::*gcl-major-version* 2)
             (and (= system::*gcl-major-version* 2)
diff --git a/upgrade.lisp b/upgrade.lisp
index 9abc2e04f..bf16e09a2 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.123")
+         (asdf-version "2.26.124")
          (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 707e63658..77a3e8e93 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"2.26.123"
+"2.26.124"
-- 
GitLab