summaryrefslogtreecommitdiff
path: root/guix
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-09-02 12:00:02 +0200
committerLudovic Courtès <ludo@gnu.org>2021-09-03 10:41:55 +0200
commite53d8a84c6fbf7641e7d0e6e8658da0bb01fcd71 (patch)
tree179b27cab1eceb10924f83c205c9af3c6fff10f1 /guix
parentff68088eaabde73d7f107763f38034ce38800339 (diff)
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".
Diffstat (limited to 'guix')
-rw-r--r--guix/scripts/publish.scm14
1 files 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 <substitutable> 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)))