[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[bug#38518] [PATCH 3/7] challenge: Report the best narinfo URI.
From: |
Ludovic Courtès |
Subject: |
[bug#38518] [PATCH 3/7] challenge: Report the best narinfo URI. |
Date: |
Sun, 8 Dec 2019 12:26:33 +0100 |
* 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 ...)).
---
guix/scripts/challenge.scm | 2 +-
guix/scripts/substitute.scm | 7 ++++---
2 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/guix/scripts/challenge.scm b/guix/scripts/challenge.scm
index 17e87f0291..aabb2ee549 100644
--- a/guix/scripts/challenge.scm
+++ b/guix/scripts/challenge.scm
@@ -192,7 +192,7 @@ inconclusive reports."
(report (G_ " no local build for '~a'~%") item))
(for-each (lambda (narinfo)
(report (G_ " ~50a: ~a~%")
- (uri->string (first (narinfo-uris narinfo)))
+ (uri->string (narinfo-best-uri narinfo))
(hash->string
(narinfo-hash->sha256 (narinfo-hash narinfo)))))
narinfos))
diff --git a/guix/scripts/substitute.scm b/guix/scripts/substitute.scm
index b6034a75d2..4802fbd1fe 100755
--- a/guix/scripts/substitute.scm
+++ b/guix/scripts/substitute.scm
@@ -80,6 +80,7 @@
narinfo-signature
narinfo-hash->sha256
+ narinfo-best-uri
lookup-narinfos
lookup-narinfos/diverse
@@ -913,7 +914,7 @@ expected by the daemon."
(for-each (cute format #t "~a/~a~%" (%store-prefix) <>)
(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"
(or file-size 0)
(or (narinfo-size narinfo) 0))))
@@ -967,7 +968,7 @@ this is a rough approximation."
(_ (or (string=? compression2 "none")
(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:
the URI, its compression method (a string), and the compressed file size."
(define choices
@@ -1008,7 +1009,7 @@ DESTINATION as a nar file. Verify the substitute against
ACL."
store-item))
(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.
(format #t "~a~%" (narinfo-hash narinfo))
--
2.24.0
- [bug#38518] [PATCH 0/7] 'guix challenge' can diff archives directly, Ludovic Courtès, 2019/12/07
- [bug#38518] [PATCH 0/7] 'guix challenge' can diff archives directly, zimoun, 2019/12/08
- [bug#38518] [PATCH 1/7] serialization: Add 'fold-archive'., Ludovic Courtès, 2019/12/08
- [bug#38518] [PATCH 2/7] guix archive: Add '--list'., Ludovic Courtès, 2019/12/08
- [bug#38518] [PATCH 3/7] challenge: Report the best narinfo URI.,
Ludovic Courtès <=
- [bug#38518] [PATCH 4/7] serialization: Remove unused procedure., Ludovic Courtès, 2019/12/08
- [bug#38518] [PATCH 5/7] progress: Add 'progress-report-port'., Ludovic Courtès, 2019/12/08
- [bug#38518] [PATCH 7/7] challenge: Support "--diff=diffoscope"., Ludovic Courtès, 2019/12/08
- [bug#38518] [PATCH 6/7] challenge: Add "--diff"., Ludovic Courtès, 2019/12/08
- bug#38518: [PATCH 0/7] 'guix challenge' can diff archives directly, Ludovic Courtès, 2019/12/12