guix-commits
[Top][All Lists]
Advanced

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

01/06: packages: 'package-field-location' preserves the original file na


From: guix-commits
Subject: 01/06: packages: 'package-field-location' preserves the original file name.
Date: Mon, 22 Feb 2021 17:44:26 -0500 (EST)

civodul pushed a commit to branch master
in repository guix.

commit 66c9bc35efdf05c2ddccc82fb23a3150b611d565
Author: Ludovic Courtès <ludo@gnu.org>
AuthorDate: Mon Feb 22 17:58:11 2021 +0100

    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.
---
 guix/packages.scm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/guix/packages.scm b/guix/packages.scm
index 57bc148..7f45417 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)



reply via email to

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