package-register: Improve status de-duplication.

If a package with a new status is registered, make sure to update its entry in
`package-registry'.

Signed-off-by: Dan Hackney <dan@haxney.org>

package-test.el

@@ -1043,6 +1043,22 @@
       (package-register addy)
       (package-register addy)
       package-registry))
+  (expect `((addy ,(make-package :name 'addy
+                                 :version '(1 0)
+                                 :type 'single
+                                 :status 'installed
+                                 :archive 'manual)))
+    (let (package-registry)
+      (package-register (make-package :name 'addy
+                                      :version '(1 0)
+                                      :type 'single
+                                      :archive 'manual))
+      (package-register (make-package :name 'addy
+                                      :version '(1 0)
+                                      :type 'single
+                                      :status 'installed
+                                      :archive 'manual))
+      package-registry))
 
   (desc "package-archive-url")
   (expect (package (concat "file://" test-dir "upstream/"))

package.el

@@ -590,9 +590,10 @@ present."
     (if existing-pkgs
       (unless (loop for other in existing-pkgs
                     when (and (eq (package-name pkg) (package-name other))
-                             (equal (package-version pkg) (package-version other))
-                             (eq (package-archive pkg) (package-archive other)))
-                    return t)
+                              (equal (package-version pkg) (package-version other))
+                              (eq (package-archive pkg) (package-archive other)))
+                    do (setf (package-status other) (package-status pkg))
+                    and return t)
         (nconc existing-pkgs (list pkg))
         pkg)
       (aput 'package-registry pkg-name (list pkg)))))