nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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:
Ludovic Courtès 2015-10-28 11:48:27 +01:00
parent f151298fa0
commit a89dde1ed8
2 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
guix/scripts/challenge.scm
View File

@ -125,10 +125,8 @@ taken since we do not import the archives."
servers)) servers))
;; No 'assert-valid-narinfo' on purpose. ;; No 'assert-valid-narinfo' on purpose.
(narinfos -> (fold (lambda (narinfo vhash) (narinfos -> (fold (lambda (narinfo vhash)
(if narinfo (vhash-cons (narinfo-path narinfo) narinfo
(vhash-cons (narinfo-path narinfo) narinfo vhash))
vhash)
vhash))
vlist-null vlist-null
remote))) remote)))
(return (filter-map (lambda (item local) (return (filter-map (lambda (item local)

4
guix/scripts/substitute.scm
View File

@ -598,7 +598,9 @@ information is available locally."
(let-values (((valid? value) (let-values (((valid? value)
(cached-narinfo cache path))) (cached-narinfo cache path)))
(if valid? (if valid?
(values (cons value cached) missing) (if value
(values (cons value cached) missing)
(values cached missing))
(values cached (cons path missing))))) (values cached (cons path missing)))))
'() '()
'() '()