aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLudovic Courtès <ludo@gnu.org>2017-07-30 17:19:42 +0200
committerLudovic Courtès <ludo@gnu.org>2017-07-30 17:22:13 +0200
commit228a3982df157847554abc9d0831d687264d8ebd (patch)
treeebf7a0b9e326b9022b01d9bd3650ea5160766022
parent1398a43816011c435fb6723154dbf1d3414b5b3d (diff)
downloadguix-228a3982df157847554abc9d0831d687264d8ebd.tar
guix-228a3982df157847554abc9d0831d687264d8ebd.tar.gz
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.
-rw-r--r--guix/git-download.scm7
1 files changed, 6 insertions, 1 deletions
diff --git a/guix/git-download.scm b/guix/git-download.scm
index 5019a3e62f..7397cbe7f5 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)