diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2014-05-27 23:19:49 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2014-05-27 23:19:49 +0200 |
| commit | af018f5e0a1b7c67e9f40ca68929bd35b94206d3 (patch) | |
| tree | 8c3efe66f8ac1f6178357937c0a41c6f5ff8f0f8 /guix/scripts/archive.scm | |
| parent | d84a7be6675bd647931d8eff9134d00dd5a6bd58 (diff) | |
| parent | 35066aa596931ef84922298c2760ceba69940cd1 (diff) | |
| download | guix-patches-af018f5e0a1b7c67e9f40ca68929bd35b94206d3.tar guix-patches-af018f5e0a1b7c67e9f40ca68929bd35b94206d3.tar.gz | |
Merge branch 'master' into core-updates
Diffstat (limited to 'guix/scripts/archive.scm')
| -rw-r--r-- | guix/scripts/archive.scm | 6 |
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))))) |