diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2019-06-18 09:50:38 +0200 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2019-06-18 16:25:09 +0200 |
| commit | 9353b199c18caca4a429f20423e1a5e7bc26a8da (patch) | |
| tree | 6d06218bce1425226410050a01e53ba938d8b1b5 | |
| parent | 5c7f87881a52a6424fc6722376b990284a06de5a (diff) | |
| download | guix-9353b199c18caca4a429f20423e1a5e7bc26a8da.tar.gz guix-9353b199c18caca4a429f20423e1a5e7bc26a8da.zip | |
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'.
| -rw-r--r-- | guix/scripts/build.scm | 5 |
1 files changed, 4 insertions, 1 deletions
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)) |