From 2f0f9bc0bd2e64c05919ebbe6dd0fb0623570978 Mon Sep 17 00:00:00 2001 From: Stephanie Kim Date: Mon, 29 Apr 2024 17:03:29 +0000 Subject: [PATCH] [depot_tools] Update GCS dotfile naming Sometimes the object name can have more than one dot like 20.11.0/f9a337cfa0e2b92d3e5c671c26b454bd8e99769e. Currently, the dotfiles would be .20_.* This change makes it so that the dotfiles would be .20_11_0_f9a337cfa0e2b92d3e5c671c26b454bd8e99769e.* Bug: b/328065301 Change-Id: I043a4b5fd56e48b046cfdc9a2fde3204b1bb638c Reviewed-on: https://chromium-review.googlesource.com/c/chromium/tools/depot_tools/+/5491861 Reviewed-by: Joanna Wang Commit-Queue: Stephanie Kim --- download_from_google_storage.py | 4 ++-- gclient.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/download_from_google_storage.py b/download_from_google_storage.py index e114df9a5..f3fc51cb8 100755 --- a/download_from_google_storage.py +++ b/download_from_google_storage.py @@ -45,8 +45,8 @@ MIGRATION_TOGGLE_FILE_SUFFIX = '_is_first_class_gcs' def construct_migration_file_name(gcs_object_name): # Remove any forward slashes gcs_file_name = gcs_object_name.replace('/', '_') - # Remove any extensions - gcs_file_name = gcs_file_name.split('.')[0] + # Remove any dots + gcs_file_name = gcs_file_name.replace('.', '_') return f'.{gcs_file_name}{MIGRATION_TOGGLE_FILE_SUFFIX}' diff --git a/gclient.py b/gclient.py index 9f039c7c1..e4f2ba31a 100755 --- a/gclient.py +++ b/gclient.py @@ -2653,7 +2653,7 @@ class GcsDependency(Dependency): or f'.{gcs_file_name}') # Remove any forward slashes and drop any extensions - file_prefix = self.object_name.replace('/', '_').split('.')[0] + file_prefix = self.object_name.replace('/', '_').replace('.', '_') hash_file = os.path.join(output_dir, f'.{file_prefix}_hash') migration_toggle_file = os.path.join( output_dir,