[Sbcl-commits] CVS: sbcl/src/code target-package.lisp,1.31,1.32

[Christophe R. <cr...@us...>]

Update of /cvsroot/sbcl/sbcl/src/code
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv2407/src/code

Modified Files:
	target-package.lisp 
Log Message:
0.8.20.26:
	Fix MAKE-PACKAGE.ERROR.[34] (PFD ansi-tests, exposed by removal
	of the TOPLEVEL restart)


Index: target-package.lisp
===================================================================
RCS file: /cvsroot/sbcl/sbcl/src/code/target-package.lisp,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -d -r1.31 -r1.32
--- target-package.lisp	9 Dec 2004 15:32:52 -0000	1.31
+++ target-package.lisp	16 Mar 2005 10:21:52 -0000	1.32
@@ -477,15 +477,17 @@
 	     (push n (package-%nicknames package)))
 	    ((eq found package))
 	    ((string= (the string (package-%name found)) n)
-             (error 'simple-package-error
-                    :package package
-                    :format-control "~S is a package name, so it cannot be a nickname for ~S."
-                    :format-arguments (list n (package-%name package))))
+             (cerror "Ignore this nickname."
+		     'simple-package-error
+		     :package package
+		     :format-control "~S is a package name, so it cannot be a nickname for ~S."
+		     :format-arguments (list n (package-%name package))))
 	    (t
-             (error 'simple-package-error
-                    :package package
-                    :format-control "~S is already a nickname for ~S."
-                    :format-arguments (list n (package-%name found))))))))
+             (cerror "Leave this nickname alone."
+		     'simple-package-error
+		     :package package
+		     :format-control "~S is already a nickname for ~S."
+		     :format-arguments (list n (package-%name found))))))))
 
 (defun make-package (name &key
 			  (use '#.*default-package-use-list*)