From 0654a033ea7a8b6adefb7223e12adc2719cba196 Mon Sep 17 00:00:00 2001 From: Francois-Rene Rideau <fare@tunes.org> Date: Thu, 23 Dec 2010 13:58:43 -0500 Subject: [PATCH] 2.011.9: fix an error message (lp#693886). Thanks to Attila Lendvai. --- asdf.asd | 2 +- asdf.lisp | 5 ++--- test/run-shell-command-test.script | 2 +- 3 files changed, 4 insertions(+), 5 deletions(-) diff --git a/asdf.asd b/asdf.asd index 23a4e1d4..6d749d3f 100644 --- a/asdf.asd +++ b/asdf.asd @@ -12,7 +12,7 @@ :licence "MIT" :description "Another System Definition Facility" :long-description "ASDF builds Common Lisp software organized into defined systems." - :version "2.011.8" + :version "2.011.9" ;;:version #.(asdf:asdf-version) ; how do we make that the *described* ASDF's version rather than the *previously loaded* ASDF's version? :depends-on () :components diff --git a/asdf.lisp b/asdf.lisp index 363cb348..cfee229f 100644 --- a/asdf.lisp +++ b/asdf.lisp @@ -80,7 +80,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.011.8") + (asdf-version "2.011.9") (existing-asdf (fboundp 'find-system)) (existing-version *asdf-version*) (already-there (equal asdf-version existing-version))) @@ -1681,8 +1681,7 @@ recursive calls to traverse.") required-op required-c required-v)) (retry () :report (lambda (s) - (format s "~@<Retry loading component ~S.~@:>" - (component-find-path required-c))) + (format s "~@<Retry loading component ~S.~@:>" required-c)) :test (lambda (c) (or (null c) diff --git a/test/run-shell-command-test.script b/test/run-shell-command-test.script index 823fc309..6c490bfe 100644 --- a/test/run-shell-command-test.script +++ b/test/run-shell-command-test.script @@ -3,7 +3,7 @@ (load-asdf) ;;; test asdf run-shell-command function -;;; Stas Bokuraev found (and fixed) a bug where on clisp asdf:run-shell-command might not return +;;; Stas Boukarev found (and fixed) a bug where on clisp asdf:run-shell-command might not return ;;; the right value. This attemtps to test for that. (quit-on-error (assert (eql 1 (asdf:run-shell-command "/usr/bin/false"))) -- GitLab