[Emacs-diffs] trunk r115917: emacs-lisp/package.el (package--check-signature): Fix download error handling

[Daiki Ueno]

------------------------------------------------------------
revno: 115917
revision-id: address@hidden
parent: address@hidden
committer: Daiki Ueno <address@hidden>
branch nick: trunk
timestamp: Wed 2014-01-08 15:25:21 +0900
message:
  emacs-lisp/package.el (package--check-signature): Fix download error handling
  
  * emacs-lisp/package.el (url-recreate-url): Declare.
  (url-http-target-url): Declare.
  (package-handle-response): Include requested URL in the error
  message.
  (package--check-signature): Don't re-signal errors from
  package--with-work-buffer.  Suggested by Stefan Monnier.
modified:
  lisp/ChangeLog                 changelog-20091113204419-o5vbwnq5f7feedwu-1432
  lisp/emacs-lisp/package.el     package.el-20100617020707-ybavz666awsxwin6-2

=== modified file 'lisp/ChangeLog'
--- a/lisp/ChangeLog    2014-01-07 23:36:29 +0000
+++ b/lisp/ChangeLog    2014-01-08 06:25:21 +0000
@@ -1,3 +1,12 @@
+2014-01-08  Daiki Ueno  <address@hidden>
+
+       * emacs-lisp/package.el (url-recreate-url): Declare.
+       (url-http-target-url): Declare.
+       (package-handle-response): Include requested URL in the error
+       message.
+       (package--check-signature): Don't re-signal errors from
+       package--with-work-buffer.  Suggested by Stefan Monnier.
+
 2014-01-07  Bastien Guerry  <address@hidden>
 
        * minibuffer.el (completion--try-word-completion): When both a

=== modified file 'lisp/emacs-lisp/package.el'
--- a/lisp/emacs-lisp/package.el        2014-01-07 10:58:03 +0000
+++ b/lisp/emacs-lisp/package.el        2014-01-08 06:25:21 +0000
@@ -210,6 +210,8 @@
 (declare-function lm-header "lisp-mnt" (header))
 (declare-function lm-commentary "lisp-mnt" (&optional file))
 (defvar url-http-end-of-headers)
+(declare-function url-recreate-url "url" (urlobj))
+(defvar url-http-target-url)
 
 (defcustom package-archives '(("gnu" . "http://elpa.gnu.org/packages/";))
   "An alist of archives from which to fetch.
@@ -789,7 +791,8 @@
   (require 'url-http)
   (let ((response (url-http-parse-response)))
     (when (or (< response 200) (>= response 300))
-      (error "Error during download request:%s"
+      (error "Error downloading %s:%s"
+            (url-recreate-url url-http-target-url)
             (buffer-substring-no-properties (point) (line-end-position))))))
 
 (defun package--archive-file-exists-p (location file)
@@ -820,10 +823,8 @@
        (sig-file (concat file ".sig"))
        sig-content
        good-signatures)
-    (condition-case-unless-debug error
-       (setq sig-content (package--with-work-buffer location sig-file
-                           (buffer-string)))
-      (error "Failed to download %s: %S" sig-file (cdr error)))
+    (setq sig-content (package--with-work-buffer location sig-file
+                       (buffer-string)))
     (epg-context-set-home-directory context homedir)
     (epg-verify-string context sig-content (buffer-string))
     ;; The .sig file may contain multiple signatures.  Success if one