diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-11-19 22:16:44 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-11-19 22:36:03 +0100 |
| commit | 55d095c653e8fda73ad111c067dece66c31a49e0 (patch) | |
| tree | 7d11fc4ee0502492cc38b21d19fb0a3da27291b3 /guix/build/utils.scm | |
| parent | edbd8f3f7eeb0e49c03ca611e43b5a777bd0c762 (diff) | |
| download | guix-patches-55d095c653e8fda73ad111c067dece66c31a49e0.tar guix-patches-55d095c653e8fda73ad111c067dece66c31a49e0.tar.gz | |
utils: Add #:keep-permissions? parameter to 'copy-recursively'.
* guix/build/utils.scm (copy-recursively): Add #:keep-permissions? and
honor it.
* doc/guix.texi (Build Utilities): Adjust accordingly.
Diffstat (limited to 'guix/build/utils.scm')
| -rw-r--r-- | guix/build/utils.scm | 19 |
1 files changed, 12 insertions, 7 deletions
diff --git a/guix/build/utils.scm b/guix/build/utils.scm index 470e5cf001..11ac6a8a7b 100644 --- a/guix/build/utils.scm +++ b/guix/build/utils.scm @@ -344,11 +344,12 @@ name." (log (current-output-port)) (follow-symlinks? #f) (copy-file copy-file) - keep-mtime?) + keep-mtime? keep-permissions?) "Copy SOURCE directory to DESTINATION. Follow symlinks if FOLLOW-SYMLINKS? is true; otherwise, just preserve them. Call COPY-FILE to copy regular files. When KEEP-MTIME? is true, keep the modification time of the files in SOURCE on -those of DESTINATION. Write verbose output to the LOG port." +those of DESTINATION. When KEEP-PERMISSIONS? is true, preserve file +permissions. Write verbose output to the LOG port." (define strip-source (let ((len (string-length source))) (lambda (file) @@ -366,16 +367,20 @@ those of DESTINATION. Write verbose output to the LOG port." (else (copy-file file dest) (when keep-mtime? - (set-file-time dest stat)))))) + (set-file-time dest stat)) + (when keep-permissions? + (chmod dest (stat:perms stat))))))) (lambda (dir stat result) ; down (let ((target (string-append destination (strip-source dir)))) (mkdir-p target))) (lambda (dir stat result) ; up - (when keep-mtime? - (let ((target (string-append destination - (strip-source dir)))) - (set-file-time target stat)))) + (let ((target (string-append destination + (strip-source dir)))) + (when keep-mtime? + (set-file-time target stat)) + (when keep-permissions? + (chmod target (stat:perms stat))))) (const #t) ; skip (lambda (file stat errno result) (format (current-error-port) "i/o error: ~a: ~a~%" |