pk-crypto: Add pretty-printer to 'gcry-error' exceptions.

* guix/pk-crypto.scm (string->canonical-sexp, sign, generate-key): Pass
  the procedure name as the first argument to 'throw'.
  (gcrypt-error-printer): New procedure.
  <top level>: Add call to 'set-exception-printer!'.
* guix/nar.scm (restore-one-item): Add 'proc' parameter to 'catch'
  handler for 'gcry-error.
* guix/scripts/archive.scm (%options, generate-key-pair, authorize-key):
  Likewise.
* guix/scripts/substitute-binary.scm (narinfo-signature->canonical-sexp):
  Likewise.

1 files changed, 3 insertions, 3 deletions

diff --git a/guix/scripts/archive.scm b/guix/scripts/archive.scm
index 0a2e186da6..84904e29da 100644
--- a/guix/scripts/archive.scm
+++ b/guix/scripts/archive.scm
@@ -123,7 +123,7 @@ Export/import one or more packages from/to the store.\n"))
                               (string->canonical-sexp
                                (or arg %key-generation-parameters))))
                          (alist-cons 'generate-key params result)))
-                     (lambda (key err)
+                     (lambda (key proc err)
                        (leave (_ "invalid key generation parameters: ~a: ~a~%")
                               (error-source err)
                               (error-string err))))))
@@ -248,7 +248,7 @@ this may take time...~%"))
   (let* ((pair   (catch 'gcry-error
                    (lambda ()
                      (generate-key parameters))
-                   (lambda (key err)
+                   (lambda (key proc err)
                      (leave (_ "key generation failed: ~a: ~a~%")
                             (error-source err)
                             (error-string err)))))
@@ -275,7 +275,7 @@ the input port."
     (catch 'gcry-error
       (lambda ()
         (string->canonical-sexp (get-string-all (current-input-port))))
-      (lambda (key err)
+      (lambda (key proc err)
         (leave (_ "failed to read public key: ~a: ~a~%")
                (error-source err) (error-string err)))))