[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
04/09: challenge: Report the best narinfo URI.
From: |
guix-commits |
Subject: |
04/09: challenge: Report the best narinfo URI. |
Date: |
Thu, 12 Dec 2019 12:17:55 -0500 (EST) |
civodul pushed a commit to branch master
in repository guix.
commit 4736d06f78e09883bdd24186c396cdd4e6a74a6f
Author: Ludovic Courtès <address@hidden>
Date: Wed Dec 4 23:07:03 2019 +0100
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 ...)).
---
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 17e87f0..aabb2ee 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 b6034a7..4802fbd 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))
- branch master updated (336afa1 -> 16b92d0), guix-commits, 2019/12/12
- 01/09: linux-boot: Don't ignore flags when mounting root file system., guix-commits, 2019/12/12
- 02/09: serialization: Add 'fold-archive'., guix-commits, 2019/12/12
- 06/09: progress: Add 'progress-report-port'., guix-commits, 2019/12/12
- 09/09: news: Add entry for "guix challenge --diff"., guix-commits, 2019/12/12
- 04/09: challenge: Report the best narinfo URI.,
guix-commits <=
- 03/09: guix archive: Add '--list'., guix-commits, 2019/12/12
- 05/09: serialization: Remove unused procedure., guix-commits, 2019/12/12
- 08/09: challenge: Support "--diff=diffoscope"., guix-commits, 2019/12/12
- 07/09: challenge: Add "--diff"., guix-commits, 2019/12/12