diff options
| author | Mathieu Othacehe <othacehe@gnu.org> | 2021-08-31 13:31:57 +0200 |
|---|---|---|
| committer | Mathieu Othacehe <othacehe@gnu.org> | 2021-08-31 13:33:30 +0200 |
| commit | 222f4661ed11b225f458cbe495a296f233129bec (patch) | |
| tree | 6e230ed99d8a74e933a7eba18fc6d8c00a3a3f90 /guix/scripts/publish.scm | |
| parent | 590be0a1ed7f6467fe39cb95889e54d2addabd46 (diff) | |
| download | guix-patches-222f4661ed11b225f458cbe495a296f233129bec.tar guix-patches-222f4661ed11b225f458cbe495a296f233129bec.tar.gz | |
publish: Do not render the narinfo "System" field.
This has been discussed here: https://issues.guix.gnu.org/50040.
* guix/scripts/publish.scm (narinfo-string): Do not render the "System" field
that is expensive to compute and currently unused.
Diffstat (limited to 'guix/scripts/publish.scm')
| -rw-r--r-- | guix/scripts/publish.scm | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm index 913cbd4fda..f67f81acb1 100644 --- a/guix/scripts/publish.scm +++ b/guix/scripts/publish.scm @@ -4,6 +4,7 @@ ;;; Copyright © 2015, 2016, 2017, 2018, 2019, 2020, 2021 Ludovic Courtès <ludo@gnu.org> ;;; Copyright © 2020 Maxim Cournoyer <maxim.cournoyer@gmail.com> ;;; Copyright © 2021 Simon Tournier <zimon.toutoune@gmail.com> +;;; Copyright © 2021 Mathieu Othacehe <othacehe@gnu.org> ;;; ;;; This file is part of GNU Guix. ;;; @@ -358,20 +359,20 @@ References: ~a~%" compression))) compressions) hash size references)) - ;; Do not render a "Deriver" or "System" line if we are rendering - ;; info for a derivation. + ;; Do not render a "Deriver" line if we are rendering info for a + ;; derivation. Also do not render a "System" line that would be + ;; 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 "~aSystem: ~a~%Deriver: ~a~%" - base-info (derivation-system drv) - (basename 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. 'System' is currently unused. + ;; optional. (if (= ENOENT (system-error-errno args)) base-info (apply throw args)))))) |