summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2013-04-04 21:47:55 +0200
committerLudovic Courtès <ludo@gnu.org>2013-04-12 21:57:58 +0200
commit7ce1f2160fa783e9a43f8f8d8d5775d05a6b0638 (patch)
treede681aad0329843d37619e29e68686d9b1c018bf
parent419fffa2e84bdcfee13572e1b346a7487926113d (diff)
downloadguix-7ce1f2160fa783e9a43f8f8d8d5775d05a6b0638.tar.gz
substitute-binary: Fix communication of several store paths to the daemon.
* guix/scripts/substitute-binary.scm (guix-substitute-binary)["--query"]:
  Emit blank lines only after the complete list of store paths has been
  returned.
-rwxr-xr-xguix/scripts/substitute-binary.scm12
1 files changed, 6 insertions, 6 deletions
diff --git a/guix/scripts/substitute-binary.scm b/guix/scripts/substitute-binary.scm
index 6e886b6c96..389acab094 100755
--- a/guix/scripts/substitute-binary.scm
+++ b/guix/scripts/substitute-binary.scm
@@ -191,9 +191,9 @@ failure."
                              '())))
                     (for-each (lambda (narinfo)
                                 (when narinfo
-                                  (display (narinfo-path narinfo))
-                                  (newline)))
-                              substitutable)))
+                                  (format #t "~a~%" (narinfo-path narinfo))))
+                              substitutable)
+                    (newline)))
                  (("info" paths ..1)
                   ;; Reply info about PATHS if it's in CACHE.
                   (let ((substitutable
@@ -215,9 +215,9 @@ failure."
                                           (narinfo-references narinfo))
                                 (format #t "~a\n~a\n"
                                         (or (narinfo-file-size narinfo) 0)
-                                        (or (narinfo-size narinfo) 0))
-                                (newline))
-                              substitutable)))
+                                        (or (narinfo-size narinfo) 0)))
+                              substitutable)
+                    (newline)))
                  (wtf
                   (error "unknown `--query' command" wtf)))
                (loop (read-line)))))))