nixo
/
guix-devel
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

git-download: Remove call to 'canonicalize-path'. 

* guix/git-download.scm (git-predicate): Remove call to
'canonicalize-path' since this could lead to discrepancies.  For
instance it broke 'make update-guix-package' since it passes a
non-canonical directory name.
This commit is contained in:
Ludovic Courtès 2017-07-30 17:19:42 +02:00
parent 1398a43816
commit 228a3982df
No known key found for this signature in database
GPG Key ID: 090B11993D9AEBB5
1 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
guix/git-download.scm
View File

@ -191,7 +191,12 @@ absolute file name and STAT is the result of 'lstat'."
result))) result)))
vlist-null vlist-null
files)) files))
(prefix-length (+ 1 (string-length (canonicalize-path directory))))
;; Note: For this to work we must *not* call 'canonicalize-path' on
;; DIRECTORY or we would get discrepancies of the returned lambda is
;; called with a non-canonical file name.
(prefix-length (+ 1 (string-length directory)))
(status (close-pipe pipe))) (status (close-pipe pipe)))
(and (zero? status) (and (zero? status)
(lambda (file stat) (lambda (file stat)