me
/
guix
Archived
1
0
Fork 0
Code

challenge: Report the best narinfo URI. 

* guix/scripts/substitute.scm (select-uri): Rename to...
(narinfo-best-uri): ... this, and make public.  Update callers.
* guix/scripts/challenge.scm (summarize-report): Use 'narinfo-best-uri'
instead of (first (narinfo-uris ...)).
master
Ludovic Courtès 2019-12-04 23:07:03 +01:00
parent 044277f610
commit 4736d06f78
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
guix/scripts/challenge.scm
View File

@ -192,7 +192,7 @@ inconclusive reports."
(report (G_ " no local build for '~a'~%") item)) (report (G_ " no local build for '~a'~%") item))
(for-each (lambda (narinfo) (for-each (lambda (narinfo)
(report (G_ " ~50a: ~a~%") (report (G_ " ~50a: ~a~%")
(uri->string (first (narinfo-uris narinfo))) (uri->string (narinfo-best-uri narinfo))
(hash->string (hash->string
(narinfo-hash->sha256 (narinfo-hash narinfo))))) (narinfo-hash->sha256 (narinfo-hash narinfo)))))
narinfos)) narinfos))

7
guix/scripts/substitute.scm
View File

@ -80,6 +80,7 @@
narinfo-signature narinfo-signature
narinfo-hash->sha256 narinfo-hash->sha256
narinfo-best-uri
lookup-narinfos lookup-narinfos
lookup-narinfos/diverse lookup-narinfos/diverse
@ -913,7 +914,7 @@ expected by the daemon."
(for-each (cute format #t "~a/~a~%" (%store-prefix) <>) (for-each (cute format #t "~a/~a~%" (%store-prefix) <>)
(narinfo-references narinfo)) (narinfo-references narinfo))
(let-values (((uri compression file-size) (select-uri narinfo))) (let-values (((uri compression file-size) (narinfo-best-uri narinfo)))
(format #t "~a\n~a\n" (format #t "~a\n~a\n"
(or file-size 0) (or file-size 0)
(or (narinfo-size narinfo) 0)))) (or (narinfo-size narinfo) 0))))
@ -967,7 +968,7 @@ this is a rough approximation."
(_ (or (string=? compression2 "none") (_ (or (string=? compression2 "none")
(string=? compression2 "gzip"))))) (string=? compression2 "gzip")))))
(define (select-uri narinfo) (define (narinfo-best-uri narinfo)
"Select the \"best\" URI to download NARINFO's nar, and return three values: "Select the \"best\" URI to download NARINFO's nar, and return three values:
the URI, its compression method (a string), and the compressed file size." the URI, its compression method (a string), and the compressed file size."
(define choices (define choices
@ -1008,7 +1009,7 @@ DESTINATION as a nar file. Verify the substitute against ACL."
store-item)) store-item))
(let-values (((uri compression file-size) (let-values (((uri compression file-size)
(select-uri narinfo))) (narinfo-best-uri narinfo)))
;; Tell the daemon what the expected hash of the Nar itself is. ;; Tell the daemon what the expected hash of the Nar itself is.
(format #t "~a~%" (narinfo-hash narinfo)) (format #t "~a~%" (narinfo-hash narinfo))