From 8daf2442e2af8b9546e61f5e11efc0f88d29d2af Mon Sep 17 00:00:00 2001 From: Takuto Ikuta Date: Thu, 28 Oct 2021 05:51:18 +0000 Subject: [PATCH] gsutil: use shorter path for temp dir Temp dir used to download gsutil seems somehow hit max path length limit on Windows builders. Bug: 1264242 Change-Id: Ib924932542dbbe68f4ef58ca604724dcb645330f Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/3247566 Commit-Queue: Takuto Ikuta Commit-Queue: Junji Watanabe Auto-Submit: Takuto Ikuta Owners-Override: Takuto Ikuta Reviewed-by: Junji Watanabe Reviewed-by: Fumitoshi Ukai --- gsutil.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/gsutil.py b/gsutil.py index 52bd5199f3..61aaafe1f7 100755 --- a/gsutil.py +++ b/gsutil.py @@ -79,7 +79,7 @@ def download_gsutil(version, target_dir): @contextlib.contextmanager def temporary_directory(base): - tmpdir = tempfile.mkdtemp(prefix='gsutil_py', dir=base) + tmpdir = tempfile.mkdtemp(prefix='t', dir=base) try: yield tmpdir finally: @@ -122,7 +122,7 @@ def ensure_gsutil(version, target, clean): if cleanup_path: shutil.rmtree(cleanup_path) - download_dir = os.path.join(instance_dir, 'download') + download_dir = os.path.join(instance_dir, 'd') target_zip_filename = download_gsutil(version, instance_dir) with zipfile.ZipFile(target_zip_filename, 'r') as target_zip: target_zip.extractall(download_dir)