Commit 1274f3ea authored by Robert P. Goldman's avatar Robert P. Goldman

Fix bug in AROUND method for OPERATE (operate.lisp).

Also, add a test case and bump version to 3.1.3.3.
parent 540edfb2
......@@ -75,7 +75,7 @@
:licence "MIT"
:description "Another System Definition Facility"
:long-description "ASDF builds Common Lisp software organized into defined systems."
:version "3.1.3.2" ;; to be automatically updated by make bump-version
:version "3.1.3.4" ;; to be automatically updated by make bump-version
:depends-on ()
#+asdf3 :encoding #+asdf3 :utf-8
:class #.(if (find-class 'package-inferred-system nil) 'package-inferred-system 'system)
......
;;; -*- mode: Common-Lisp; Base: 10 ; Syntax: ANSI-Common-Lisp ; buffer-read-only: t; -*-
;;; This is ASDF 3.1.3.2: Another System Definition Facility.
;;; This is ASDF 3.1.3.4: Another System Definition Facility.
;;;
;;; Feedback, bug reports, and patches are all welcome:
;;; please mail to <asdf-devel@common-lisp.net>.
......
......@@ -59,7 +59,7 @@ The :FORCE or :FORCE-NOT argument to OPERATE can be:
(etypecase operation
(operation (let ((name (type-of operation))
(initargs (operation-original-initargs operation)))
#'(lambda () (make-operation name :original-initargs initargs initargs))))
#'(lambda () (apply 'make-operation name :original-initargs initargs initargs))))
((or symbol string) (constantly operation))))
(component-path (typecase component ;; to remake the component after ASDF upgrade
(component (component-find-path component))
......
......@@ -59,7 +59,7 @@
(assert (make-instance 'my-good-operation))
;; This test exercises the backward-compatibiMlity mechanism of operation,
;; This test exercises the backward-compatibility mechanism of operation,
;; whereby traditional unqualified operations are implicitly downward and sideward
(defclass trivial-operation (operation) ())
......@@ -73,3 +73,6 @@
(trivial-operation "test-asdf/test-module-depend" "quux")))
(operate 'trivial-operation 'test-asdf/test-module-depend)
;;; this test intended to catch a bug in operate :around method in operate.lisp,
;;; thanks to Jan Moringen [2014/08/10:rpg]
(operate (make-instance 'trivial-operation) 'test-asdf/test-module-depend)
......@@ -67,7 +67,7 @@ previously-loaded version of ASDF."
;; "3.4.5.67" would be a development version in the official branch, on top 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.1.3.2")
(asdf-version "3.1.3.4")
(existing-version (asdf-version)))
(setf *asdf-version* asdf-version)
(when (and existing-version (not (equal asdf-version existing-version)))
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment