summary refs log tree commit diff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2019-06-23 19:28:52 +0200
committerLudovic Courtès <ludo@gnu.org>2019-06-23 19:53:03 +0200
commit92359aed40fe76dcfb13ddf521fa8ac4c2735611 (patch)
tree3ced11fc87d02b1bc32c73902ce2eb36f4f063f7
parent0f2d9c3290c9094e036d5a160969b1690a576d14 (diff)
downloadguix-92359aed40fe76dcfb13ddf521fa8ac4c2735611.tar.gz
guix build: '--log-file' no longer returns several log files.
Fixes a regression introduced in
9353b199c18caca4a429f20423e1a5e7bc26a8da whereby something like:

  guix build --log-file $(guix build -d guile)

would return two log files.  This led to a failure of 'tests/guix-build.sh'.

* guix/scripts/build.scm (guix-build): Filter out derivation file names
from ITEMS.
-rw-r--r--guix/scripts/build.scm3
1 files changed, 2 insertions, 1 deletions
diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 74071d104b..ec58ba871b 100644
--- a/guix/scripts/build.scm
+++ b/guix/scripts/build.scm
@@ -916,7 +916,8 @@ needed."
                                    '())))
                    (items (filter-map (match-lambda
                                         (('argument . (? store-path? file))
-                                         file)
+                                         (and (not (derivation-path? file))
+                                              file))
                                         (_ #f))
                                       opts))
                    (roots (filter-map (match-lambda