commit e2e5e3be9c7eb8b004e2583e0d0a57914a83a914
author Mike Frysinger <vapier@chromium.org> Sun Jul 03 01:51:25 2022 -0400
committer Chromeos LUCI <chromeos-scoped@luci-project-accounts.iam.gserviceaccount.com> Wed Jul 06 15:57:36 2022 +0000
tree 04ddd2ac8740c318fd2b45de81290cf5733b62a2
parent 8b9869c0584bf77c8e77eeeb2bea1ccf5aca7298

deploy_chrome: detect tarball compression

This should handle bzip2 & zstd efficiently.

BUG=b:237821259
TEST=CQ passes

Change-Id: Ia1be263c9a15dbe42d4ef0e40e90f4da4de4263b
Reviewed-on: https://chromium-review.googlesource.com/c/chromiumos/chromite/+/3738534
Auto-Submit: Mike Frysinger <vapier@chromium.org>
Reviewed-by: Alex Klein <saklein@chromium.org>
Tested-by: Mike Frysinger <vapier@chromium.org>
Commit-Queue: Alex Klein <saklein@chromium.org>

scripts/deploy_chrome.py

diff --git a/scripts/deploy_chrome.py b/scripts/deploy_chrome.py
index bc792e2..030478a 100644
--- a/scripts/deploy_chrome.py
+++ b/scripts/deploy_chrome.py
@@ -900,8 +900,10 @@
         shutil.move(filename, staging_dir)
       osutils.RmDir(os.path.join(staging_dir, 'system'), ignore_missing=True)
     else:
+      compression = cros_build_lib.CompressionDetectType(pkg_path)
+      compressor = cros_build_lib.FindCompressor(compression)
       cros_build_lib.dbg_run(
-          ['tar', '--strip-components', '4', '--extract',
+          ['tar', '--strip-components', '4', '--extract', '-I', compressor,
            '--preserve-permissions', '--file', pkg_path, '.%s' % chrome_dir],
           cwd=staging_dir)