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 17:30:47 +0200
commitd7c5d27795500c1db3bca6c2ebf9066e32d36adb (patch)
treed65cffa4bd9a5527c9f67eee9a40aa0a10fd5537
parent8f3114b7a433480c9534903d23d659ce3fb12ffb (diff)
downloadguix-d7c5d27795500c1db3bca6c2ebf9066e32d36adb.tar
guix-d7c5d27795500c1db3bca6c2ebf9066e32d36adb.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)))