From 93c8158fd4996e2a7184eb0f8d63812a7bc2562c Mon Sep 17 00:00:00 2001 From: Christophe Rhodes Date: Thu, 9 Dec 2004 15:32:51 +0000 Subject: [PATCH] 0.8.17.26: Fix from VJA (sbcl-devel 2004-12-09) for EXPORT continue-format-control ... actually give it the arguments it needs. ... write a test that doesn't actually test for the bug, but makes me feel better anyway. --- src/code/target-package.lisp | 3 ++- tests/packages.impure.lisp | 5 +++++ version.lisp-expr | 2 +- 3 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp index f85db1602..d83554597 100644 --- a/src/code/target-package.lisp +++ b/src/code/target-package.lisp @@ -985,7 +985,8 @@ error if any of PACKAGES is not a valid package designator." :package package :format-control "~@" - :format-arguments (list (package-%name package) missing))) + :format-arguments (list (package-%name package) missing)) + 'import (package-%name package)) (import missing package)) (import imports package)) diff --git a/tests/packages.impure.lisp b/tests/packages.impure.lisp index c1910eea1..b7e22b008 100644 --- a/tests/packages.impure.lisp +++ b/tests/packages.impure.lisp @@ -17,4 +17,9 @@ (assert (eq *foo* (find-package ""))) (assert (delete-package "")) +(handler-case + (export :foo) + (package-error (c) (princ c)) + (:no-error (&rest args) (error "(EXPORT :FOO) returned ~S" args))) + (sb-ext:quit :unix-status 104) diff --git a/version.lisp-expr b/version.lisp-expr index e4e7fb6ea..4c11e51bc 100644 --- a/version.lisp-expr +++ b/version.lisp-expr @@ -17,4 +17,4 @@ ;;; checkins which aren't released. (And occasionally for internal ;;; versions, especially for internal versions off the main CVS ;;; branch, it gets hairier, e.g. "0.pre7.14.flaky4.13".) -"0.8.17.25" +"0.8.17.26"