substitute: 'lookup-narinfos' returns exactly a list of narinfos.
* guix/scripts/substitute.scm (lookup-narinfos): Filter out #f values from CACHED, such that the end result is exactly a list of narinfos, not interspersed with #f. * guix/scripts/challenge.scm (discrepancies): Assume REMOTE is a list of narinfos.
This commit is contained in:
parent
f151298fa0
commit
a89dde1ed8
@ -125,10 +125,8 @@ taken since we do not import the archives."
|
||||
servers))
|
||||
;; No 'assert-valid-narinfo' on purpose.
|
||||
(narinfos -> (fold (lambda (narinfo vhash)
|
||||
(if narinfo
|
||||
(vhash-cons (narinfo-path narinfo) narinfo
|
||||
vhash)
|
||||
vhash))
|
||||
(vhash-cons (narinfo-path narinfo) narinfo
|
||||
vhash))
|
||||
vlist-null
|
||||
remote)))
|
||||
(return (filter-map (lambda (item local)
|
||||
|
@ -598,7 +598,9 @@ information is available locally."
|
||||
(let-values (((valid? value)
|
||||
(cached-narinfo cache path)))
|
||||
(if valid?
|
||||
(values (cons value cached) missing)
|
||||
(if value
|
||||
(values (cons value cached) missing)
|
||||
(values cached missing))
|
||||
(values cached (cons path missing)))))
|
||||
'()
|
||||
'()
|
||||
|
Loading…
Reference in New Issue
Block a user