diff options
author | Efraim Flashner <efraim@flashner.co.il> | 2024-04-09 13:06:55 +0300 |
---|---|---|
committer | Efraim Flashner <efraim@flashner.co.il> | 2024-07-23 17:54:53 +0300 |
commit | 20c4e778a9058f556a32094ebf9f8ddeee49fda8 (patch) | |
tree | dff6f7ada9250407e2f010dc25f5fd39d1aa9066 | |
parent | d007b64356764f49677c78d82643f1125b5353b7 (diff) | |
download | guix-20c4e778a9058f556a32094ebf9f8ddeee49fda8.tar.gz guix-20c4e778a9058f556a32094ebf9f8ddeee49fda8.zip |
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
-rw-r--r-- | guix/build/graft.scm | 31 |
1 files changed, 2 insertions, 29 deletions
diff --git a/guix/build/graft.scm b/guix/build/graft.scm index 281dbaba6f..c8c7e33ab2 100644 --- a/guix/build/graft.scm +++ b/guix/build/graft.scm @@ -312,33 +312,6 @@ an exception is caught." (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 @@ file name pairs." (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 @@ file name pairs." store) (chmod output (stat:perms stat))))))) ((directory) - (mkdir-p* dest)) + (mkdir-p dest)) (else (error "unsupported file type" stat))))) |