From 50c8e0ee11fabdc5acf4d0cf9060034d480eb07a Mon Sep 17 00:00:00 2001 From: "ojan@chromium.org" Date: Thu, 4 Dec 2014 22:18:36 +0000 Subject: [PATCH] Make --output and --sha1_filename work well together. --sha1_filename unnecessarily forces the output to have the same filename and be in the same directory. The code in main already correctly sets the file name to the sha1_filename minus the .sha1, so the only change is to actually use the --output path the same way the rest of the code does. R=iannucci@chromium.org Review URL: https://codereview.chromium.org/752803003 git-svn-id: svn://svn.chromium.org/chrome/trunk/tools/depot_tools@293251 0039d316-1c4b-4281-b951-d872f2087c98 --- download_from_google_storage.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/download_from_google_storage.py b/download_from_google_storage.py index 4545a9557..8f85ed331 100755 --- a/download_from_google_storage.py +++ b/download_from_google_storage.py @@ -158,8 +158,7 @@ def enumerate_work_queue(input_filename, work_queue, directory, with open(input_filename, 'rb') as f: sha1_match = re.match('^([A-Za-z0-9]{40})$', f.read(1024).rstrip()) if sha1_match: - work_queue.put( - (sha1_match.groups(1)[0], input_filename.replace('.sha1', ''))) + work_queue.put((sha1_match.groups(1)[0], output)) return 1 if not ignore_errors: raise InvalidFileError('No sha1 sum found in %s.' % input_filename)