mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
union: Gracefully handle dangling symlinks in the input.
Fixes <http://bugs.gnu.org/26949>. Reported by Pjotr Prins <pjotr.public12@thebird.nl>. * guix/build/union.scm (file-is-directory?): Return #f when FILE does not exist or is a dangling symlink. (file=?): Pass #f as a second argument to 'stat'; return #f when both ST1 or ST2 is #f. * tests/profiles.scm (test-equalm): New macro. ("union vs. dangling symlink"): New test.
This commit is contained in:
parent
41f76ae08a
commit
22ef06b801
3 changed files with 53 additions and 20 deletions
|
@ -17,6 +17,7 @@
|
||||||
(eval . (put 'call-with-prompt 'scheme-indent-function 1))
|
(eval . (put 'call-with-prompt 'scheme-indent-function 1))
|
||||||
(eval . (put 'test-assert 'scheme-indent-function 1))
|
(eval . (put 'test-assert 'scheme-indent-function 1))
|
||||||
(eval . (put 'test-assertm 'scheme-indent-function 1))
|
(eval . (put 'test-assertm 'scheme-indent-function 1))
|
||||||
|
(eval . (put 'test-equalm 'scheme-indent-function 1))
|
||||||
(eval . (put 'test-equal 'scheme-indent-function 1))
|
(eval . (put 'test-equal 'scheme-indent-function 1))
|
||||||
(eval . (put 'test-eq 'scheme-indent-function 1))
|
(eval . (put 'test-eq 'scheme-indent-function 1))
|
||||||
(eval . (put 'call-with-input-string 'scheme-indent-function 1))
|
(eval . (put 'call-with-input-string 'scheme-indent-function 1))
|
||||||
|
|
|
@ -47,14 +47,17 @@ (define (files-in-directory dirname)
|
||||||
(loop (cons file files)))))))
|
(loop (cons file files)))))))
|
||||||
|
|
||||||
(define (file-is-directory? file)
|
(define (file-is-directory? file)
|
||||||
(eq? 'directory (stat:type (stat file))))
|
(match (stat file #f)
|
||||||
|
(#f #f) ;maybe a dangling symlink
|
||||||
|
(st (eq? 'directory (stat:type st)))))
|
||||||
|
|
||||||
(define (file=? file1 file2)
|
(define (file=? file1 file2)
|
||||||
"Return #t if FILE1 and FILE2 are regular files and their contents are
|
"Return #t if FILE1 and FILE2 are regular files and their contents are
|
||||||
identical, #f otherwise."
|
identical, #f otherwise."
|
||||||
(let ((st1 (stat file1))
|
(let ((st1 (stat file1 #f))
|
||||||
(st2 (stat file2)))
|
(st2 (stat file2 #f)))
|
||||||
;; When deduplication is enabled, identical files share the same inode.
|
;; When deduplication is enabled, identical files share the same inode.
|
||||||
|
(and st1 st2
|
||||||
(or (= (stat:ino st1) (stat:ino st2))
|
(or (= (stat:ino st1) (stat:ino st2))
|
||||||
(and (eq? (stat:type st1) 'regular)
|
(and (eq? (stat:type st1) 'regular)
|
||||||
(eq? (stat:type st2) 'regular)
|
(eq? (stat:type st2) 'regular)
|
||||||
|
@ -71,7 +74,7 @@ (define buf2 (make-bytevector len))
|
||||||
(n2 (get-bytevector-n! port2 buf2 0 len)))
|
(n2 (get-bytevector-n! port2 buf2 0 len)))
|
||||||
(and (equal? n1 n2)
|
(and (equal? n1 n2)
|
||||||
(or (eof-object? n1)
|
(or (eof-object? n1)
|
||||||
(loop)))))))))))))
|
(loop))))))))))))))
|
||||||
|
|
||||||
(define* (union-build output inputs
|
(define* (union-build output inputs
|
||||||
#:key (log-port (current-error-port))
|
#:key (log-port (current-error-port))
|
||||||
|
|
|
@ -50,6 +50,12 @@ (define-syntax-rule (test-assertm name exp)
|
||||||
(run-with-store %store exp
|
(run-with-store %store exp
|
||||||
#:guile-for-build (%guile-for-build))))
|
#:guile-for-build (%guile-for-build))))
|
||||||
|
|
||||||
|
(define-syntax-rule (test-equalm name value exp)
|
||||||
|
(test-equal name
|
||||||
|
value
|
||||||
|
(run-with-store %store exp
|
||||||
|
#:guile-for-build (%guile-for-build))))
|
||||||
|
|
||||||
;; Example manifest entries.
|
;; Example manifest entries.
|
||||||
|
|
||||||
(define guile-1.8.8
|
(define guile-1.8.8
|
||||||
|
@ -366,6 +372,29 @@ (define (find-input name)
|
||||||
get-string-all)
|
get-string-all)
|
||||||
"foo!"))))))
|
"foo!"))))))
|
||||||
|
|
||||||
|
(test-equalm "union vs. dangling symlink" ;<https://bugs.gnu.org/26949>
|
||||||
|
"does-not-exist"
|
||||||
|
(mlet* %store-monad
|
||||||
|
((thing1 -> (dummy-package "dummy"
|
||||||
|
(build-system trivial-build-system)
|
||||||
|
(arguments
|
||||||
|
`(#:guile ,%bootstrap-guile
|
||||||
|
#:builder
|
||||||
|
(let ((out (assoc-ref %outputs "out")))
|
||||||
|
(mkdir out)
|
||||||
|
(symlink "does-not-exist"
|
||||||
|
(string-append out "/dangling"))
|
||||||
|
#t)))))
|
||||||
|
(thing2 -> (package (inherit thing1) (name "dummy2")))
|
||||||
|
(drv (profile-derivation (packages->manifest
|
||||||
|
(list thing1 thing2))
|
||||||
|
#:hooks '()
|
||||||
|
#:locales? #f))
|
||||||
|
(profile -> (derivation->output-path drv)))
|
||||||
|
(mbegin %store-monad
|
||||||
|
(built-derivations (list drv))
|
||||||
|
(return (readlink (readlink (string-append profile "/dangling")))))))
|
||||||
|
|
||||||
(test-end "profiles")
|
(test-end "profiles")
|
||||||
|
|
||||||
;;; Local Variables:
|
;;; Local Variables:
|
||||||
|
|
Loading…
Reference in a new issue