TakeV/guix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

git-download: Fix 'git-predicate' file membership.

Browse source 
Previously, it the predicate would return #t for "m4/ChangeLog" if
"ChangeLog" (in the top-level directory) was in FILES.  This commit
fixes the ambiguity.

* guix/git-download.scm (git-predicate): Add 'inodes' variable.  Use it
to determine file membership.
This commit is contained in:
Ludovic Courtès 2017-05-07 18:05:14 +02:00
parent 4da1816628
commit ba2260dbbc
No known key found for this signature in database
GPG key ID: 090B11993D9AEBB5
1 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
guix/git-download.scm
View file

@ -145,6 +145,10 @@ (define (parent-directory? thing directory)
(reverse lines))
(line
(loop (cons line lines))))))
(inodes (map (lambda (file)
(let ((stat (lstat file)))
(cons (stat:dev stat) (stat:ino stat))))
files))
(status (close-pipe pipe)))
(and (zero? status)
(lambda (file stat)
@ -155,8 +159,10 @@ (define (parent-directory? thing directory)
(any (lambda (f) (parent-directory? f file))
files))
((or 'regular 'symlink)
(any (lambda (f) (string-suffix? f file))
files))
;; Comparing file names is always tricky business so we rely on
;; inode numbers instead
(member (cons (stat:dev stat) (stat:ino stat))
inodes))
(_
#f))))))