[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
02/06: guix build: '--log-file' looks for build logs of equivalent deriv
From: |
guix-commits |
Subject: |
02/06: guix build: '--log-file' looks for build logs of equivalent derivations. |
Date: |
Tue, 18 Jun 2019 11:03:54 -0400 (EDT) |
civodul pushed a commit to branch master
in repository guix.
commit 9353b199c18caca4a429f20423e1a5e7bc26a8da
Author: Ludovic Courtès <address@hidden>
Date: Tue Jun 18 09:50:38 2019 +0200
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) <log-file?>: 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 8fa700c..61ca4dc 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))
- branch master updated (a32e3b9 -> 2e8c912), guix-commits, 2019/06/18
- 06/06: gnu: aircrack-ng: Update to 1.5.2., guix-commits, 2019/06/18
- 05/06: gnu: Add emacs-gruvbox-theme, guix-commits, 2019/06/18
- 02/06: guix build: '--log-file' looks for build logs of equivalent derivations.,
guix-commits <=
- 01/06: tests: Avoid 'delete-paths' calls for 'derivation-prerequisites-to-build'., guix-commits, 2019/06/18
- 03/06: doc: Replace invalid uses of @var with @code., guix-commits, 2019/06/18
- 04/06: gnu: Add python-slurm-magic., guix-commits, 2019/06/18