From e53d8a84c6fbf7641e7d0e6e8658da0bb01fcd71 Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Thu, 2 Sep 2021 12:00:02 +0200 Subject: publish: Simplify 'narinfo-string'. This is a followup to 222f4661ed11b225f458cbe495a296f233129bec, which was intended to improve performance of 'narinfo-string'. * guix/scripts/publish.scm (narinfo-string): Remove 'catch' and 'read-derivation-from-file' call when rendering "Deriver". --- guix/scripts/publish.scm | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index f67f81acb1..25846b7dc2 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -364,18 +364,8 @@ References: ~a~%" ;; expensive to compute and is currently unused. (info (if (not deriver) base-info - (catch 'system-error - (lambda () - (let ((drv (read-derivation-from-file deriver))) - (format #f "~aDeriver: ~a~%" - base-info (basename deriver)))) - (lambda args - ;; DERIVER might be missing, but that's fine: - ;; it's only used for where it's - ;; optional. - (if (= ENOENT (system-error-errno args)) - base-info - (apply throw args)))))) + (format #f "~aDeriver: ~a~%" + base-info (basename deriver)))) (signature (base64-encode-string (canonical-sexp->string (signed-string info))))) (format #f "~aSignature: 1;~a;~a~%" info (gethostname) signature))) -- cgit v1.2.3