mirror/guix
1
0
Fork 0
mirror of https://git.savannah.gnu.org/git/guix.git synced 2025-02-01 07:16:39 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

packages: 'package-field-location' preserves the original file name.

Browse source 
Fixes <https://bugs.gnu.org/39425>.
Reported by Alex ter Weele <alex.ter.weele@gmail.com>.

* guix/packages.scm (package-field-location): Remove 'with-fluids' for
'%file-port-name-canonicalization'.  Change the 'file' field of the
resulting location to FILE.
This commit is contained in:
Ludovic Courtès 2020-03-20 23:34:03 +01:00
parent fe4a37276b
commit f2b24f01f4
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 18 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
guix/packages.scm
View file

@ -355,7 +355,6 @@ (define (goto port line column)
(catch 'system-error (catch 'system-error
(lambda () (lambda ()
;; In general we want to keep relative file names for modules. ;; In general we want to keep relative file names for modules.
(with-fluids ((%file-port-name-canonicalization 'relative))
(call-with-input-file (search-path %load-path file) (call-with-input-file (search-path %load-path file)
(lambda (port) (lambda (port)
(goto port line column) (goto port line column)
@ -364,16 +363,16 @@ (define (goto port line column)
(let ((field (assoc field inits))) (let ((field (assoc field inits)))
(match field (match field
((_ value) ((_ value)
;; Put the `or' here, and not in the first argument of (let ((props (source-properties value)))
;; `and=>', to work around a compiler bug in 2.0.5. (and props
(or (and=> (source-properties value) ;; Preserve the original file name, which may be a
source-properties->location) ;; relative file name.
(and=> (source-properties field) (let ((loc (source-properties->location props)))
source-properties->location))) (set-field loc (location-file) file)))))
(_ (_
#f)))) #f))))
(_ (_
#f)))))) #f)))))
(lambda _ (lambda _
#f))) #f)))
(_ #f))) (_ #f)))