From 2b809a537469b39e44080d33899e6b0756956309 Mon Sep 17 00:00:00 2001 From: Harmen Stoppels Date: Tue, 14 Jul 2020 00:19:04 +0200 Subject: Add `-o` flag to tar decompressor (#17427) For normal users, `-o` or `--no-same-owner` (GNU extension) is the default behavior, but for the root user, `tar` attempts to preserve the ownership from the tarball. This makes `tar` use `-o` all the time. This should improve untarring files owned by users not available in rootless Docker builds. --- lib/spack/spack/util/compression.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/spack/spack/util/compression.py b/lib/spack/spack/util/compression.py index 1688b49f1b..ebbe0519d0 100644 --- a/lib/spack/spack/util/compression.py +++ b/lib/spack/spack/util/compression.py @@ -14,7 +14,7 @@ EXTS = ["gz", "bz2", "xz", "Z"] NOTAR_EXTS = ["zip", "tgz", "tbz2", "txz"] # Add PRE_EXTS and EXTS last so that .tar.gz is matched *before* .tar or .gz -ALLOWED_ARCHIVE_TYPES = [".".join(l) for l in product( +ALLOWED_ARCHIVE_TYPES = [".".join(ext) for ext in product( PRE_EXTS, EXTS)] + PRE_EXTS + EXTS + NOTAR_EXTS @@ -36,7 +36,7 @@ def decompressor_for(path, extension=None): bunzip2 = which('bunzip2', required=True) return bunzip2 tar = which('tar', required=True) - tar.add_default_arg('-xf') + tar.add_default_arg('-oxf') return tar -- cgit v1.2.3-60-g2f50