diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-04-22 11:41:52 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-04-22 11:41:52 +0200 |
| commit | 6ef3644e3462d4a98323f556eefa92a6765ed437 (patch) | |
| tree | c540c4cebb281bfb516e87f73f9951e2995ffb2b /guix/nar.scm | |
| parent | 6f69588529f9898dc4f2defd21603cc4abbaca17 (diff) | |
| download | gnu-guix-6ef3644e3462d4a98323f556eefa92a6765ed437.tar gnu-guix-6ef3644e3462d4a98323f556eefa92a6765ed437.tar.gz | |
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.
Diffstat (limited to 'guix/nar.scm')
| -rw-r--r-- | guix/nar.scm | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/guix/nar.scm b/guix/nar.scm index 6beda91c02..0a7187c2dd 100644 --- a/guix/nar.scm +++ b/guix/nar.scm @@ -370,7 +370,7 @@ protected from GC." (let ((signature (catch 'gcry-error (lambda () (string->canonical-sexp signature)) - (lambda (err . _) + (lambda (key proc err) (raise (condition (&message (message "signature is not a valid \ |