diff options
| author | Ludovic Courtès <ludo@gnu.org> | 2020-12-09 22:16:35 +0100 |
|---|---|---|
| committer | Ludovic Courtès <ludo@gnu.org> | 2020-12-15 17:32:09 +0100 |
| commit | ed7d02f7c198970ce3fe94bcee47592963326446 (patch) | |
| tree | 86b9e7564dc438b17940422cec8ce3163a8a92c7 /tests/guix-archive.sh | |
| parent | 465d2cb286170933577de045e6e6dad7205bfe10 (diff) | |
| download | guix-patches-ed7d02f7c198970ce3fe94bcee47592963326446.tar guix-patches-ed7d02f7c198970ce3fe94bcee47592963326446.tar.gz | |
serialization: 'restore-file' sets canonical timestamp and permissions.
* guix/serialization.scm (restore-file): Set the permissions and mtime
of FILE.
* guix/nar.scm (finalize-store-file): Pass #:reset-timestamps? #f to
'register-items'.
* tests/nar.scm (rm-rf): Add 'chmod' calls to ensure files are writable.
("write-file + restore-file with symlinks"): Ensure every file in OUTPUT
passes 'canonical-file?'.
* tests/guix-archive.sh: Run "chmod -R +w" before "rm -rf".
Diffstat (limited to 'tests/guix-archive.sh')
| -rw-r--r-- | tests/guix-archive.sh | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/guix-archive.sh b/tests/guix-archive.sh index e796c62f9a..00b87ff0ac 100644 --- a/tests/guix-archive.sh +++ b/tests/guix-archive.sh @@ -1,5 +1,5 @@ # GNU Guix --- Functional package management for GNU -# Copyright © 2013, 2014, 2015, 2019 Ludovic Courtès <ludo@gnu.org> +# Copyright © 2013, 2014, 2015, 2019, 2020 Ludovic Courtès <ludo@gnu.org> # # This file is part of GNU Guix. # @@ -28,7 +28,7 @@ tmpdir="t-archive-dir-$$" rm -f "$archive" "$archive_alt" rm -rf "$tmpdir" -trap 'rm -f "$archive" "$archive_alt"; rm -rf "$tmpdir"' EXIT +trap 'rm -f "$archive" "$archive_alt"; chmod -R +w "$tmpdir"; rm -rf "$tmpdir"' EXIT guix archive --export guile-bootstrap > "$archive" guix archive --export guile-bootstrap:out > "$archive_alt" |