guix-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

02/03: guix build: '--log-file' no longer returns several log files.


From: guix-commits
Subject: 02/03: guix build: '--log-file' no longer returns several log files.
Date: Sun, 23 Jun 2019 13:53:10 -0400 (EDT)

civodul pushed a commit to branch master
in repository guix.

commit 92359aed40fe76dcfb13ddf521fa8ac4c2735611
Author: Ludovic Court├Ęs <address@hidden>
Date:   Sun Jun 23 19:28:52 2019 +0200

    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.
---
 guix/scripts/build.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/scripts/build.scm b/guix/scripts/build.scm
index 74071d1..ec58ba8 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



reply via email to

[Prev in Thread] Current Thread [Next in Thread]