[PATCH] git-download: Fix 'git-predicate' to use absolute paths.

[PATCH] git-download: Fix 'git-predicate' to use absolute paths.

[Christopher Baines]

git ls-files will return paths relative to the repository directory. This
commit prepends the repository directory to those paths when calling lstat,
such that 'git-predicate' works if the current working directory is not the
repository directory.

* guix/git-download.scm (git-predicate): Prepend repository directory to the
  file path when calling lstat.
---
 guix/git-download.scm | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/guix/git-download.scm b/guix/git-download.scm
index 9f6d20ee3..316835502 100644
--- a/guix/git-download.scm
+++ b/guix/git-download.scm
@@ -146,7 +146,8 @@ absolute file name and STAT is the result of 'lstat'."
                           (line
                            (loop (cons line lines))))))
          (inodes      (map (lambda (file)
-                             (let ((stat (lstat file)))
+                             (let ((stat (lstat
+                                          (string-append directory "/" file))))
                                (cons (stat:dev stat) (stat:ino stat))))
                            files))
          (status      (close-pipe pipe)))
-- 
2.13.0

Re: [PATCH] git-download: Fix 'git-predicate' to use absolute paths.

[Christopher Baines]

[-- Attachment #1.1: Type: text/plain, Size: 684 bytes --]

On 25/05/17 16:58, Christopher Baines wrote:
> git ls-files will return paths relative to the repository directory. This
> commit prepends the repository directory to those paths when calling lstat,
> such that 'git-predicate' works if the current working directory is not the
> repository directory.

I've just hit this issue again, but in a different way. This way is easy
to reproduce though.

  guix build -e "(begin (use-modules (gnu packages package-management))
(current-guix))"

If you run that while the current working directory is not the root of
the repository, you should get:

  ERROR: In procedure lstat: No such file or directory: ".dir-locals.el"



[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 858 bytes --]

Re: [PATCH] git-download: Fix 'git-predicate' to use absolute paths.

[Ludovic Courtès]

Christopher Baines <mail@cbaines.net> skribis:

> git ls-files will return paths relative to the repository directory. This
> commit prepends the repository directory to those paths when calling lstat,
> such that 'git-predicate' works if the current working directory is not the
> repository directory.
>
> * guix/git-download.scm (git-predicate): Prepend repository directory to the
>   file path when calling lstat.

Good catch!  Applied, thanks.

Ludo’.