[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
07/08: gexp: Use a relative file name.
From: |
Ludovic Courtès |
Subject: |
07/08: gexp: Use a relative file name. |
Date: |
Mon, 20 Jun 2016 21:51:01 +0000 (UTC) |
civodul pushed a commit to branch master
in repository guix.
commit a9601e23528c6018a3a6d4ad44b7d119df67ab6b
Author: Ludovic Courtès <address@hidden>
Date: Mon Jun 20 23:46:32 2016 +0200
gexp: Use a relative file name.
This is a followup to cbbbb7be0fbaa11ff75bce92f2d82131ff8db104.
* guix/gexp.scm (%utils-module): Use a file name relative to this file
instead of using 'search-path'.
---
guix/gexp.scm | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/guix/gexp.scm b/guix/gexp.scm
index 2bf1013..b929b79 100644
--- a/guix/gexp.scm
+++ b/guix/gexp.scm
@@ -856,8 +856,10 @@ and in the current monad setting (system type, etc.)"
(define %utils-module
;; This file provides 'mkdir-p', needed to implement 'imported-files' and
- ;; other primitives below.
- (local-file (search-path %load-path "guix/build/utils.scm")
+ ;; other primitives below. Note: We give the file name relative to this
+ ;; file you are currently reading; 'search-path' could return a file name
+ ;; relative to the current working directory.
+ (local-file "build/utils.scm"
"build-utils.scm"))
(define* (imported-files files
- branch master updated (b0d388c -> e702e26), Ludovic Courtès, 2016/06/20
- 08/08: hydra: Add jobs for the system tests., Ludovic Courtès, 2016/06/20
- 06/08: build: 'make check-system' now honors $TESTS., Ludovic Courtès, 2016/06/20
- 04/08: packages: Export 'scheme-modules'., Ludovic Courtès, 2016/06/20
- 05/08: tests: Add a mechanism to describe and discover system tests., Ludovic Courtès, 2016/06/20
- 01/08: tests: base: Fully honor the OS passed to 'run-basic-test'., Ludovic Courtès, 2016/06/20
- 07/08: gexp: Use a relative file name.,
Ludovic Courtès <=
- 02/08: vm: 'qemu-command' honors its argument., Ludovic Courtès, 2016/06/20
- 03/08: tests: Add system installation test., Ludovic Courtès, 2016/06/20