Make --output and --sha1_filename work well together.

download_from_google_storage.py

Index: download_from_google_storage.py
diff --git a/download_from_google_storage.py b/download_from_google_storage.py
index ffdd4ee97893ee7fb6e25e3a9cdc3be01268f838..b98de668cab3c7565d7cc08623f5fa6f4bcab89d 100755
--- a/download_from_google_storage.py
+++ b/download_from_google_storage.py
@@ -163,8 +163,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)