aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-04-12 15:52:27 +0200
committerLudovic Courtès <ludo@gnu.org>2013-04-12 21:58:47 +0200
commitf03f0c9a867e22dd999a8519f4bf03b182739c97 (patch)
tree7a6954aa2b82db0569298cdecf5fcfe1d065f37a
parentc7b62db614a40c7d7dc93b7e763e3741325486df (diff)
downloadguix-f03f0c9a867e22dd999a8519f4bf03b182739c97.tar
guix-f03f0c9a867e22dd999a8519f4bf03b182739c97.tar.gz
substitute-binary: Correctly handle missing narinfos in `--query' mode.
* guix/scripts/substitute-binary.scm (guix-substitute-binary)["--query"]("have", "info"): Filter SUBSTITUTABLE through `narinfo?'.
-rwxr-xr-xguix/scripts/substitute-binary.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm
index 389acab094..64df4f09d6 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -192,7 +192,7 @@ failure."
(for-each (lambda (narinfo)
(when narinfo
(format #t "~a~%" (narinfo-path narinfo))))
- substitutable)
+ (filter narinfo? substitutable))
(newline)))
(("info" paths ..1)
;; Reply info about PATHS if it's in CACHE.
@@ -216,7 +216,7 @@ failure."
(format #t "~a\n~a\n"
(or (narinfo-file-size narinfo) 0)
(or (narinfo-size narinfo) 0)))
- substitutable)
+ (filter narinfo? substitutable))
(newline)))
(wtf
(error "unknown `--query' command" wtf)))