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

[Ludovic Courtès]

civodul pushed a commit to branch master
in repository guix.

commit 228a3982df157847554abc9d0831d687264d8ebd
Author: Ludovic Courtès <address@hidden>
Date:   Sun Jul 30 17:19:42 2017 +0200

    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.
---
 guix/git-download.scm | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/guix/git-download.scm b/guix/git-download.scm
index 5019a3e..7397cbe 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -191,7 +191,12 @@ absolute file name and STAT is the result of 'lstat'."
                                                 result)))
                                vlist-null
                                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)))
     (and (zero? status)
          (lambda (file stat)