01/03: gexp: 'local-file' now defaults to non-recursive.

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 020f3e41568d4f76544e3e1c10e1d8dd4effc424
Author: Ludovic Courtès <address@hidden>
Date:   Thu Jun 18 23:25:49 2015 +0200

    gexp: 'local-file' now defaults to non-recursive.
    
    Reported by Alex Kost <address@hidden>
    at <http://lists.gnu.org/archive/html/guix-devel/2015-06/msg00235.html>.
    
    * guix/gexp.scm (local-file): Change #:recursive? to default to #f.
    * tests/gexp.scm ("one local file", "gexp->derivation, local-file"): Adjust
      calls to 'add-to-store' and 'interned-file' accordingly.
---
 guix/gexp.scm  |    2 +-
 tests/gexp.scm |    4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/guix/gexp.scm b/guix/gexp.scm
index 10056e5..b3c4166 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -157,7 +157,7 @@ cross-compiling.)"
   (recursive? local-file-recursive?))             ;Boolean
 
 (define* (local-file file #:optional (name (basename file))
-                     #:key (recursive? #t))
+                     #:key recursive?)
   "Return an object representing local file FILE to add to the store; this
 object can be used in a gexp.  FILE will be added to the store under NAME--by
 default the base name of FILE.
diff --git a/tests/gexp.scm b/tests/gexp.scm
index 7e14073..fee7d87 100644
--- a/tests/gexp.scm
+++ b/tests/gexp.scm
@@ -101,7 +101,7 @@
   (let* ((file  (search-path %load-path "guix.scm"))
          (local (local-file file))
          (exp   (gexp (display (ungexp local))))
-         (intd  (add-to-store %store (basename file) #t
+         (intd  (add-to-store %store (basename file) #f
                               "sha256" file)))
     (and (gexp? exp)
          (match (gexp-inputs exp)
@@ -360,7 +360,7 @@
 
 (test-assertm "gexp->derivation, local-file"
   (mlet* %store-monad ((file ->  (search-path %load-path "guix.scm"))
-                       (intd     (interned-file file))
+                       (intd     (interned-file file #:recursive? #f))
                        (local -> (local-file file))
                        (exp ->   (gexp (begin
                                          (stat (ungexp local))