aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2021-02-22 17:58:11 +0100
committerLudovic Courtès <ludo@gnu.org>2021-02-22 23:42:08 +0100
commit66c9bc35efdf05c2ddccc82fb23a3150b611d565 (patch)
tree06445d75eb1ea20e9f84107f4faca337b2e2ba43
parent21cdb35b609c0d5a4995126ee79ec6b71578d838 (diff)
downloadguix-66c9bc35efdf05c2ddccc82fb23a3150b611d565.tar.gz
guix-66c9bc35efdf05c2ddccc82fb23a3150b611d565.zip
packages: 'package-field-location' preserves the original file name.
This fixes a regression introduced in 9a38bed2cf32e9462badfa43e74cdd4580e804fc. * guix/packages.scm (package-field-location): Do not shadow the 'file' variable.
-rw-r--r--guix/packages.scm4
1 files changed, 2 insertions, 2 deletions
diff --git a/guix/packages.scm b/guix/packages.scm
index 57bc148002..7f45417ea2 100644
--- a/guix/packages.scm
+++ b/guix/packages.scm
@@ -476,11 +476,11 @@ object."
(match (package-location package)
(($ <location> file line column)
(match (search-path %load-path file)
- ((? string? file)
+ ((? string? file-found)
(catch 'system-error
(lambda ()
;; In general we want to keep relative file names for modules.
- (call-with-input-file file
+ (call-with-input-file file-found
(lambda (port)
(goto port line column)
(match (read port)