From 3b3610a3a61da545740b477707f8af4d0fd968b1 Mon Sep 17 00:00:00 2001
From: Francois-Rene Rideau <tunes@google.com>
Date: Sun, 9 Jun 2013 16:45:25 -0400
Subject: [PATCH] 3.0.1.6: have other traverse variants not call plan-actions,
 either

---
 asdf.asd          |  2 +-
 header.lisp       |  2 +-
 plan.lisp         | 10 +++++++---
 upgrade.lisp      |  2 +-
 version.lisp-expr |  2 +-
 5 files changed, 11 insertions(+), 7 deletions(-)

diff --git a/asdf.asd b/asdf.asd
index f363af23..a96c5d20 100644
--- a/asdf.asd
+++ b/asdf.asd
@@ -74,7 +74,7 @@
   :licence "MIT"
   :description "Another System Definition Facility"
   :long-description "ASDF builds Common Lisp software organized into defined systems."
-  :version "3.0.1.5" ;; to be automatically updated by make bump-version
+  :version "3.0.1.6" ;; to be automatically updated by make bump-version
   :depends-on ()
   #+asdf3 :encoding #+asdf3 :utf-8
   ;; For most purposes, asdf itself specially counts as a builtin system.
diff --git a/header.lisp b/header.lisp
index f6e001c7..6d011e8d 100644
--- a/header.lisp
+++ b/header.lisp
@@ -1,5 +1,5 @@
 ;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp -*-
-;;; This is ASDF 3.0.1.5: Another System Definition Facility.
+;;; This is ASDF 3.0.1.6: 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 cf6c915b..a3c895df 100644
--- a/plan.lisp
+++ b/plan.lisp
@@ -391,6 +391,9 @@ the action of OPERATION on COMPONENT in the PLAN"))
            :when (or force (not (nth-value 1 (compute-action-stamp nil o c))))
            :do (perform-with-restarts o c)))
 
+  (defmethod plan-operates-on-p ((plan plan-traversal) (component-path list))
+    (plan-operates-on-p (plan-actions plan) component-path))
+
   (defmethod plan-operates-on-p ((plan list) (component-path list))
     (find component-path (mapcar 'cdr plan)
           :test 'equal :key 'component-find-path)))
@@ -422,7 +425,7 @@ the action of OPERATION on COMPONENT in the PLAN"))
     (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)))
+      plan))
 
   (define-convenience-action-methods traverse-sub-actions (operation component &key))
   (defmethod traverse-sub-actions ((operation operation) (component component) &rest keys &key &allow-other-keys)
@@ -438,7 +441,8 @@ the action of OPERATION on COMPONENT in the PLAN"))
 
   (defmethod required-components (system &rest keys &key (goal-operation 'load-op) &allow-other-keys)
     (remove-duplicates
-     (mapcar 'cdr (apply 'traverse-sub-actions goal-operation system
-                         (remove-plist-key :goal-operation keys)))
+     (mapcar 'cdr (plan-actions
+                   (apply 'traverse-sub-actions goal-operation system
+                          (remove-plist-key :goal-operation keys))))
      :from-end t)))
 
diff --git a/upgrade.lisp b/upgrade.lisp
index cc679491..d28aa8f5 100644
--- a/upgrade.lisp
+++ b/upgrade.lisp
@@ -52,7 +52,7 @@ You can compare this string with e.g.: (ASDF:VERSION-SATISFIES (ASDF:ASDF-VERSIO
          ;; "3.4.5.67" would be a development version in the official upstream of 3.4.5.
          ;; "3.4.5.0.8" would be your eighth local modification of official release 3.4.5
          ;; "3.4.5.67.8" would be your eighth local modification of development version 3.4.5.67
-         (asdf-version "3.0.1.5")
+         (asdf-version "3.0.1.6")
          (existing-version (asdf-version)))
     (setf *asdf-version* asdf-version)
     (when (and existing-version (not (equal asdf-version existing-version)))
diff --git a/version.lisp-expr b/version.lisp-expr
index 5888e601..21342a4b 100644
--- a/version.lisp-expr
+++ b/version.lisp-expr
@@ -1 +1 @@
-"3.0.1.5"
+"3.0.1.6"
-- 
GitLab