2 files changed, 5 insertions(+), 5 deletions(-)

M guix/scripts/challenge.scm
M guix/scripts/substitute.scm

@@ 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)))))
                        '()
                        '()