From 8b84d66723ff4c52bc61d0c7b1e2e25b8ac3c8ce Mon Sep 17 00:00:00 2001 From: Stefan Monnier Date: Fri, 27 Dec 2024 11:58:30 -0500 Subject: [PATCH] (package--download-and-read-archives): Fix bug#75065 * lisp/emacs-lisp/package.el (package--download-and-read-archives): Include the error info in the error message. Suggested by Konstantin Kharlamov . (package-refresh-contents, package-menu--perform-transaction): Use `error-message-string`. (cherry picked from commit a99e1cc745047977b0b7cbd25fe9df66e9c86a39) --- lisp/emacs-lisp/package.el | 15 +++++++++------ 1 file changed, 9 insertions(+), 6 deletions(-) diff --git a/lisp/emacs-lisp/package.el b/lisp/emacs-lisp/package.el index ba2d16ebed2..358eb9328a7 100644 --- a/lisp/emacs-lisp/package.el +++ b/lisp/emacs-lisp/package.el @@ -1829,10 +1829,11 @@ Populate `package-archive-contents' with the result. If optional argument ASYNC is non-nil, perform the downloads asynchronously." (dolist (archive package-archives) - (condition-case-unless-debug nil + (condition-case-unless-debug err (package--download-one-archive archive "archive-contents" async) - (error (message "Failed to download `%s' archive." - (car archive)))))) + (error (message "Failed to download `%s' archive: %s" + (car archive) + (error-message-string err)))))) (defvar package-refresh-contents-hook (list #'package--download-and-read-archives) "List of functions to call to refresh the package archive. @@ -1856,7 +1857,8 @@ downloads in the background." (when (and (package-check-signature) (file-exists-p default-keyring)) (condition-case-unless-debug error (package-import-keyring default-keyring) - (error (message "Cannot import default keyring: %S" (cdr error)))))) + (error (message "Cannot import default keyring: %s" + (error-message-string error)))))) (run-hook-with-args 'package-refresh-contents-hook async)) @@ -3992,8 +3994,9 @@ Return nil if there were no errors; non-nil otherwise." (package-delete elt nil 'nosave)) (error (push (package-desc-full-name elt) errors) - (message "Error trying to delete `%s': %S" - (package-desc-full-name elt) err))))) + (message "Error trying to delete `%s': %s" + (package-desc-full-name elt) + (error-message-string err)))))) errors)) (defun package--update-selected-packages (add remove) -- 2.39.5