From 9336b5ab551a36c3ff48dc82f2b4651989cd3afd Mon Sep 17 00:00:00 2001 From: Ludovic Courtès Date: Mon, 2 Jul 2012 01:24:40 +0200 Subject: guix-build: Display multiple outputs when needed. * guix-build.in (guix-build): Display multiple outputs when there's more than one. --- guix-build.in | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/guix-build.in b/guix-build.in index 380c203000..f232e13703 100644 --- a/guix-build.in +++ b/guix-build.in @@ -130,6 +130,8 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@")) (setlocale LC_ALL "") (textdomain "guix") + (setvbuf (current-output-port) _IOLBF) + (setvbuf (current-error-port) _IOLBF) (let* ((opts (parse-options)) (drv (filter-map (match-lambda @@ -174,6 +176,12 @@ Report bugs to: ~a.~%") "@PACKAGE_BUGREPORT@")) (or (assoc-ref opts 'dry-run?) (and (build-derivations %store drv) (for-each (lambda (d) - (display (derivation-path->output-path d)) - (newline)) + (let ((drv (call-with-input-file d + read-derivation))) + (format #t "~{~a~%~}" + (map (match-lambda + ((out-name . out) + (derivation-path->output-path + d out-name))) + (derivation-outputs drv))))) drv)))))) -- cgit v1.2.3