me
/
guix
Archived
1
0
Fork 0
Code

gexp: 'assume-valid-file-name' has files looked up under the CWD. 

Fixes a bug introduced in 5d4ad8e1be,
whereby files enclosed in 'assume-valid-file-name' would be looked up
relative to the source directory instead of relative to the current
directory.

* guix/gexp.scm (local-file): In the 'assume-valid-file-name' case, look
up FILE relative to the current working directory.
master
Ludovic Courtès 2020-10-18 00:21:33 +02:00
parent d14221bf65
commit 6be7146130
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
guix/gexp.scm
View File

@ -457,11 +457,11 @@ appears."
(delay (absolute-file-name file (current-source-directory))) (delay (absolute-file-name file (current-source-directory)))
rest ...)) rest ...))
((_ (assume-valid-file-name file) rest ...) ((_ (assume-valid-file-name file) rest ...)
;; FILE is not a literal, so resolve it relative to the source ;; FILE is not a literal, so resolve it relative to the current
;; directory. Since the user declared FILE is valid, do not pass ;; directory. Since the user declared FILE is valid, do not pass
;; #:literal? #f so that we do not warn about it later on. ;; #:literal? #f so that we do not warn about it later on.
#'(%local-file file #'(%local-file file
(delay (absolute-file-name file (current-source-directory))) (delay (absolute-file-name file (getcwd)))
rest ...)) rest ...))
((_ file rest ...) ((_ file rest ...)
;; Resolve FILE relative to the current directory. ;; Resolve FILE relative to the current directory.