From a70a852c66f97fdba03acaf10d51755d0ac13929 Mon Sep 17 00:00:00 2001
From: godofredoc <godofredoc@google.com>
Date: Thu, 17 Aug 2023 16:09:44 -0700
Subject: [PATCH] Run gsutil with full python3 and full path. (#132805)

This is to prevent failures when the gsutil.py is not executable.
---
 dev/bots/prepare_package.dart           | 10 +---------
 dev/bots/test/prepare_package_test.dart |  4 ++--
 2 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/dev/bots/prepare_package.dart b/dev/bots/prepare_package.dart
index 9f33a22cc3..bf30ae38c4 100644
--- a/dev/bots/prepare_package.dart
+++ b/dev/bots/prepare_package.dart
@@ -833,16 +833,8 @@ class ArchivePublisher {
       print('gsutil.py -- $args');
       return '';
     }
-    if (platform.isWindows) {
-      return _processRunner.runProcess(
-        <String>['python3', path.join(platform.environment['DEPOT_TOOLS']!, 'gsutil.py'), '--', ...args],
-        workingDirectory: workingDirectory,
-        failOk: failOk,
-      );
-    }
-
     return _processRunner.runProcess(
-      <String>['gsutil.py', '--', ...args],
+      <String>['python3', path.join(platform.environment['DEPOT_TOOLS']!, 'gsutil.py'), '--', ...args],
       workingDirectory: workingDirectory,
       failOk: failOk,
     );
diff --git a/dev/bots/test/prepare_package_test.dart b/dev/bots/test/prepare_package_test.dart
index e8e5cac08f..10ba341cc3 100644
--- a/dev/bots/test/prepare_package_test.dart
+++ b/dev/bots/test/prepare_package_test.dart
@@ -38,7 +38,7 @@ void main() {
     final FakePlatform platform = FakePlatform(
       operatingSystem: platformName,
       environment: <String, String>{
-        'DEPOT_TOOLS': path.join('D:', 'depot_tools'),
+        'DEPOT_TOOLS': platformName == Platform.windows ? path.join('D:', 'depot_tools'): '/depot_tools',
       },
     );
     group('ProcessRunner for $platform', () {
@@ -378,7 +378,7 @@ void main() {
       late Directory tempDir;
       final String gsutilCall = platform.isWindows
           ? 'python3 ${path.join("D:", "depot_tools", "gsutil.py")}'
-          : 'gsutil.py';
+          : 'python3 ${path.join("/", "depot_tools", "gsutil.py")}';
       final String releasesName = 'releases_$platformName.json';
       final String archiveName = platform.isLinux ? 'archive.tar.xz' : 'archive.zip';
       final String archiveMime = platform.isLinux ? 'application/x-gtar' : 'application/zip';