mirror of
https://git.in.rschanz.org/ryan77627/guix.git
synced 2024-11-07 07:26:13 -05:00
graft: Remove work-around for old guile.
* guix/build/graft.scm (mkdir-p*): Remove function. (rewrite-directory): Switch from mkdir-p* to mkdir-p. Change-Id: Ib6a80648d271c19093c05af84acb967e069ccc19
This commit is contained in:
parent
d007b64356
commit
20c4e778a9
1 changed files with 2 additions and 29 deletions
|
@ -312,33 +312,6 @@ (define (exit-on-exception proc)
|
|||
(print-exception port #f key args)
|
||||
(primitive-exit 1))))))
|
||||
|
||||
;; We need this as long as we support Guile < 2.0.13.
|
||||
(define* (mkdir-p* dir #:optional (mode #o755))
|
||||
"This is a variant of 'mkdir-p' that works around
|
||||
<http://bugs.gnu.org/24659> by passing MODE explicitly in each 'mkdir' call."
|
||||
(define absolute?
|
||||
(string-prefix? "/" dir))
|
||||
|
||||
(define not-slash
|
||||
(char-set-complement (char-set #\/)))
|
||||
|
||||
(let loop ((components (string-tokenize dir not-slash))
|
||||
(root (if absolute?
|
||||
""
|
||||
".")))
|
||||
(match components
|
||||
((head tail ...)
|
||||
(let ((path (string-append root "/" head)))
|
||||
(catch 'system-error
|
||||
(lambda ()
|
||||
(mkdir path mode)
|
||||
(loop tail path))
|
||||
(lambda args
|
||||
(if (= EEXIST (system-error-errno args))
|
||||
(loop tail path)
|
||||
(apply throw args))))))
|
||||
(() #t))))
|
||||
|
||||
(define* (rewrite-directory directory output mapping
|
||||
#:optional (store (%store-directory)))
|
||||
"Copy DIRECTORY to OUTPUT, replacing strings according to MAPPING, a list of
|
||||
|
@ -387,7 +360,7 @@ (define (destination file)
|
|||
(define (rewrite-leaf file)
|
||||
(let ((stat (lstat file))
|
||||
(dest (destination file)))
|
||||
(mkdir-p* (dirname dest))
|
||||
(mkdir-p (dirname dest))
|
||||
(case (stat:type stat)
|
||||
((symlink)
|
||||
(let ((target (readlink file)))
|
||||
|
@ -406,7 +379,7 @@ (define (rewrite-leaf file)
|
|||
store)
|
||||
(chmod output (stat:perms stat)))))))
|
||||
((directory)
|
||||
(mkdir-p* dest))
|
||||
(mkdir-p dest))
|
||||
(else
|
||||
(error "unsupported file type" stat)))))
|
||||
|
||||
|
|
Loading…
Reference in a new issue