This is an automated email from the git hooks/post-receive script.
mothacehe pushed a commit to branch master
in repository guix.
The following commit(s) were added to refs/heads/master by this push:
new 222f466 publish: Do not render the narinfo "System" field.
222f466 is described below
commit 222f4661ed11b225f458cbe495a296f233129bec
Author: Mathieu Othacehe <[email protected]>
AuthorDate: Tue Aug 31 13:31:57 2021 +0200
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.
---
guix/scripts/publish.scm | 13 +++++++------
1 file changed, 7 insertions(+), 6 deletions(-)
diff --git a/guix/scripts/publish.scm b/guix/scripts/publish.scm
index 913cbd4..f67f81a 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
<[email protected]>
;;; Copyright © 2020 Maxim Cournoyer <[email protected]>
;;; Copyright © 2021 Simon Tournier <[email protected]>
+;;; Copyright © 2021 Mathieu Othacehe <[email protected]>
;;;
;;; 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))))))
