From 9353b199c18caca4a429f20423e1a5e7bc26a8da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Ludovic=20Court=C3=A8s?= Date: Tue, 18 Jun 2019 09:50:38 +0200 Subject: [PATCH] guix build: '--log-file' looks for build logs of equivalent derivations. Previously, '--log-file' would look for log files only for the current derivation, and thus wouldn't find log files of equivalent derivations that produce the same output. * guix/scripts/build.scm (guix-build) : Replace 'derivation-file-name' by 'derivation->output-path'. --- guix/scripts/build.scm | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm index 8fa700c883..61ca4dca9f 100644 --- a/guix/scripts/build.scm +++ b/guix/scripts/build.scm @@ -935,9 +935,12 @@ needed." #:mode mode)) (cond ((assoc-ref opts 'log-file?) + ;; Pass 'show-build-log' the output file names, not the + ;; derivation file names, because there can be several + ;; derivations leading to the same output. (for-each (cut show-build-log store <> urls) (delete-duplicates - (append (map derivation-file-name drv) + (append (map derivation->output-path drv) items)))) ((assoc-ref opts 'derivations-only?) (format #t "~{~a~%~}" (map derivation-file-name drv))