@@ -136,14 +136,21 @@ def run_gsutil(self, arguments, use_gcloud_storage, quiet=False, **kwargs):
136136 """Run GSUtil or gcloud storage."""
137137 runner , additional_args = self ._get_runner_and_args (use_gcloud_storage ,
138138 quiet )
139+ cmd = arguments [0 ] if arguments else 'unknown'
139140 arguments = additional_args + arguments
140141
141142 tool_name = 'gcloud storage' if use_gcloud_storage else 'gsutil'
143+ arg_str = ' ' .join (arguments )
144+ try :
145+ cwd = os .getcwd ()
146+ except OSError :
147+ cwd = 'unknown'
142148 logs .info (
143- f'Running { tool_name } .' ,
149+ f'Running { cmd } with { tool_name } .' ,
144150 tool_name = tool_name ,
145- cwd = os .getcwd (),
146- cmd = arguments )
151+ cmd = cmd ,
152+ cwd = cwd ,
153+ arguments = arg_str )
147154
148155 env = os .environ .copy ()
149156 if not use_gcloud_storage and 'PYTHONPATH' in env :
@@ -154,18 +161,22 @@ def run_gsutil(self, arguments, use_gcloud_storage, quiet=False, **kwargs):
154161 try :
155162 result = runner .run_and_wait (arguments , env = env , ** kwargs )
156163 logs .info (
157- f'Finished running { tool_name } .' ,
164+ f'Finished running { cmd } with { tool_name } .' ,
158165 tool_name = tool_name ,
166+ cmd = cmd ,
167+ cwd = cwd ,
168+ arguments = arg_str ,
159169 return_code = result .return_code ,
160170 timed_out = result .timed_out ,
161171 output = result .output )
162172 return result
163- except Exception as e :
173+ except Exception :
164174 logs .error (
165- f'Failed to run { tool_name } .' ,
175+ f'Failed to run { cmd } with { tool_name } .' ,
166176 tool_name = tool_name ,
167- cmd = arguments ,
168- error = str (e ))
177+ cmd = cmd ,
178+ cwd = cwd ,
179+ arguments = arg_str )
169180 raise
170181
171182 def rsync (self ,
0 commit comments