diff options
| author | Christopher Baines <mail@cbaines.net> | 2019-12-26 10:49:14 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2019-12-26 10:49:14 +0000 |
| commit | 7342280ead042bfce49754e8e9efb761f353f994 (patch) | |
| tree | c7781c5794b47af6053a654a1b04368f68eba494 | |
| parent | 54b3d8d93a8039b0796aa00ee23e4899f542d6ab (diff) | |
| download | data-service-7342280ead042bfce49754e8e9efb761f353f994.tar data-service-7342280ead042bfce49754e8e9efb761f353f994.tar.gz | |
Guard against failures when loading the narinfo signing public key
| -rw-r--r-- | scripts/guix-data-service.in | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/scripts/guix-data-service.in b/scripts/guix-data-service.in index 9c84357..5822b52 100644 --- a/scripts/guix-data-service.in +++ b/scripts/guix-data-service.in @@ -141,8 +141,19 @@ (assq-ref opts 'port)) (parameterize ((%narinfo-signing-public-key - (and=> (assoc-ref opts 'narinfo-signing-public-key) - read-file-sexp)) + (catch + 'system-error + (lambda () + (and=> (assoc-ref opts 'narinfo-signing-public-key) + read-file-sexp)) + (lambda (key . args) + (simple-format + (current-error-port) + "warning: failed to load narinfo signing public key from ~A\n" + (assoc-ref opts 'narinfo-signing-private-key)) + (simple-format (current-error-port) + " ~A: ~A\n" + key args)))) (%narinfo-signing-private-key (catch 'system-error |