diff options
| author | Christopher Baines <mail@cbaines.net> | 2022-11-25 15:02:09 +0000 |
|---|---|---|
| committer | Christopher Baines <mail@cbaines.net> | 2022-11-25 15:02:09 +0000 |
| commit | 205cca52af76ae4021c040e926d3e17b838810eb (patch) | |
| tree | 122a48fd52b726bf7c70e9b38b992ed35465362c | |
| parent | c1811bc1915e5e85e2b59021f33ba8cb7c0af689 (diff) | |
| download | build-coordinator-205cca52af76ae4021c040e926d3e17b838810eb.tar build-coordinator-205cca52af76ae4021c040e926d3e17b838810eb.tar.gz | |
Stop signing the information about compressed files in narinfos
This matches up with the now not so recent change in guix publish where this
code comes from.
| -rw-r--r-- | guix-build-coordinator/utils.scm | 19 |
1 files changed, 11 insertions, 8 deletions
diff --git a/guix-build-coordinator/utils.scm b/guix-build-coordinator/utils.scm index 7eb6dfe..8067e88 100644 --- a/guix-build-coordinator/utils.scm +++ b/guix-build-coordinator/utils.scm @@ -708,17 +708,12 @@ upcoming chunk." (let* ((base-info (format #f "\ StorePath: ~a -~{~a~}\ NarHash: sha256:~a NarSize: ~d References: ~a~%" store-path - (map (match-lambda - ((compression compressed-size) - (store-item->recutils compression - compressed-size))) - compressed-files) - hash size + hash + size (string-join references " "))) ;; Do not render a "Deriver" or "System" line if we are rendering ;; info for a derivation. @@ -730,7 +725,15 @@ References: ~a~%" base-info)) (signature (base64-encode-string (canonical-sexp->string (signed-string info))))) - (format #f "~aSignature: 1;~a;~a~%" info (gethostname) signature))) + (format #f "~aSignature: 1;~a;~a~%~{~a~}" + info + (gethostname) + signature + (map (match-lambda + ((compression compressed-size) + (store-item->recutils compression + compressed-size))) + compressed-files)))) (define* (retry-on-error f #:key times delay ignore error-hook) (let loop ((attempt 1)) |