From 6b6a1144f965ba2e69a293f2c16fbcf30476f9f6 Mon Sep 17 00:00:00 2001 From: "hinoka@chromium.org" Date: Tue, 4 Nov 2014 00:40:53 +0000 Subject: [PATCH] Delete before cp in download_from_google_storage BUG= Review URL: https://codereview.chromium.org/696023002 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@292819 0039d316-1c4b-4281-b951-d872f2087c98 --- download_from_google_storage.py | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/download_from_google_storage.py b/download_from_google_storage.py index 8370515e6..ffdd4ee97 100755 --- a/download_from_google_storage.py +++ b/download_from_google_storage.py @@ -236,8 +236,13 @@ def _downloader_worker_thread(thread_num, q, force, base_url, file_url, output_filename))) continue # Fetch the file. - out_q.put('%d> Downloading %s...' % ( - thread_num, output_filename)) + out_q.put('%d> Downloading %s...' % (thread_num, output_filename)) + try: + os.remove(output_filename) # Delete the file if it exists already. + except OSError: + if os.path.exists(output_filename): + out_q.put('%d> Warning: deleting %s failed.' % ( + thread_num, output_filename)) code, _, err = gsutil.check_call('cp', '-q', file_url, output_filename) if code != 0: out_q.put('%d> %s' % (thread_num, err))