X-Git-Url: http://repo.macrolet.net/gitweb/?a=blobdiff_plain;f=src%2Fcode%2Ftarget-package.lisp;h=3f9bb9aaa40881aff86843dd5ce03d53d4738174;hb=2c5a710f4da100f8aa9c7262fa76395f73ee4307;hp=fddb492a1395581db09ad55420c537185258d26c;hpb=b400484e0aa71c263c456fe7c85f80ed5661bff1;p=sbcl.git

diff --git a/src/code/target-package.lisp b/src/code/target-package.lisp
index fddb492..3f9bb9a 100644
--- a/src/code/target-package.lisp
+++ b/src/code/target-package.lisp
@@ -599,7 +599,7 @@ implementation it is ~S." *default-package-use-list*)
        (cerror "Clobber existing package."
                "A package named ~S already exists" name)
        (setf clobber t))
-     (with-packages ()
+     (with-package-graph ()
        ;; Check for race, signal the error outside the lock.
        (when (and (not clobber) (find-package name))
          (go :restart))
@@ -640,9 +640,10 @@ implementation it is ~S." *default-package-use-list*)
 (defun rename-package (package-designator name &optional (nicknames ()))
   #!+sb-doc
   "Changes the name and nicknames for a package."
+  (let ((package nil))
   (tagbody :restart
-     (let* ((package (find-undeleted-package-or-lose package-designator))
-            (name (package-namify name))
+       (setq package (find-undeleted-package-or-lose package-designator))
+       (let* ((name (package-namify name))
             (found (find-package name))
             (nicks (mapcar #'string nicknames)))
        (unless (or (not found) (eq found package))
@@ -668,8 +669,8 @@ implementation it is ~S." *default-package-use-list*)
            (setf (package-%name package) name
                  (gethash name names) package
                  (package-%nicknames package) ()))
-         (%enter-new-nicknames package nicknames))
-       package)))
+           (%enter-new-nicknames package nicknames))))
+    package))
 
 (defun delete-package (package-designator)
   #!+sb-doc
@@ -966,8 +967,8 @@ uninterned."
                 (remove symbol shadowing-symbols)))
 
         (multiple-value-bind (s w) (find-symbol name package)
-          (declare (ignore s))
-          (cond ((or (eq w :internal) (eq w :external))
+          (cond ((not (eq symbol s)) nil)
+                ((or (eq w :internal) (eq w :external))
                  (nuke-symbol (if (eq w :internal)
                                   (package-internal-symbols package)
                                   (package-external-symbols package))
@@ -1116,6 +1117,7 @@ the importation, then a correctable error is signalled."
                    (let ((found (member sym syms :test #'string=)))
                      (if found
                          (when (not (eq (car found) sym))
+                           (setf syms (remove (car found) syms))
                            (name-conflict package 'import sym sym (car found)))
                          (push sym syms))))
                   ((not (eq s sym))