From: Stefan Kangas <stefankangas@gmail.com>
Date: Sun, 11 Dec 2022 18:00:01 +0000 (+0100)
Subject: Fix error message when installing non-existent package
X-Git-Tag: emacs-29.0.90~1234
X-Git-Url: http://git.eshelyaron.com/gitweb/?a=commitdiff_plain;h=3e349ee1198c7fc5187975c3e52e805a44f5b84b;p=emacs.git

Fix error message when installing non-existent package

* lisp/emacs-lisp/package.el (package-compute-transaction): Don't add
trailing dash to package name in non-existent package
error.  (Bug#59923)
---

diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el
index a9fd8c741e8..4d33311cb74 100644
--- a/lisp/emacs-lisp/package.el
+++ b/lisp/emacs-lisp/package.el
@@ -1949,8 +1949,10 @@ SEEN is used internally to detect infinite recursion."
               (if (eq next-pkg 'emacs)
                   (error "This package requires Emacs version %s"
                          (package-version-join next-version))
-                (error "Package `%s-%s' is unavailable"
-                       next-pkg (package-version-join next-version))))))
+                (error (if (not next-version)
+                           (format "Package `%s' is unavailable" next-pkg)
+                         (format "Package `%s' (version %s) is unavailable"
+                                 next-pkg (package-version-join next-version))))))))
           (setq packages
                 (package-compute-transaction (cons found packages)
                                              (package-desc-reqs found)