Fix cloud storage upload messages in page_sets/PRESUBMIT.py

tools/perf/page_sets/PRESUBMIT.py

 # Copyright (c) 2013 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 import os
 import re
 import sys
 
 
 def LoadSupport(input_api):
@@ skipping 62 matching lines @@
     if not os.path.exists(file_path):
       results.append(output_api.PresubmitError(
           'Hash file exists, but file not found: %s' % hash_path))
       continue
     if cloud_storage.GetHash(file_path) != file_hash:
       results.append(output_api.PresubmitError(
           'Hash file does not match file\'s actual hash: %s' % hash_path))
       continue
 
     try:
-      bucket_input = raw_input('Uploading to Cloud Storage: %s\nIs this file '
-                               '[p]ublic or Google-[i]nternal?').lower()
+      bucket_input = raw_input('Uploading to Cloud Storage: %s\n'
+                               'Is this file [p]ublic or Google-[i]nternal?'
+                               % file_path).lower()
       if 'public'.startswith(bucket_input):
         bucket = cloud_storage.PUBLIC_BUCKET
       elif ('internal'.startswith(bucket_input) or
             'google-internal'.startswith(bucket_input)):
         bucket = cloud_storage.INTERNAL_BUCKET
       else:
         results.append(output_api.PresubmitError(
             'Response was neither "public" nor "internal": %s' % bucket_input))
         return results
 
       cloud_storage.Insert(bucket, file_hash, file_path)
       results.append(output_api.PresubmitNotifyResult(
-          'Uploaded file to Cloud Storage: %s' % hash_path))
+          'Uploaded file to Cloud Storage: %s' % file_path))
     except cloud_storage.CloudStorageError, e:
       results.append(output_api.PresubmitError(
-          'Unable to upload to Cloud Storage: %s\n\n%s' % (hash_path, e)))
+          'Unable to upload to Cloud Storage: %s\n\n%s' % (file_path, e)))
 
   return results
 
 
 def _VerifyFilesInCloud(input_api, output_api):
   """Searches for .sha1 files and uploads them to Cloud Storage.
 
   It validates all the hashes and skips upload if not necessary.
   """
   results = []
   for hash_path, _ in _GetFilesNotInCloud(input_api):
     results.append(output_api.PresubmitError(
         'Attemping to commit hash file, but corresponding '
         'data file is not in Cloud Storage: %s' % hash_path))
   return results
 
 
 def CheckChangeOnUpload(input_api, output_api):
   return _SyncFilesToCloud(input_api, output_api)
 
 
 def CheckChangeOnCommit(input_api, output_api):
   return _VerifyFilesInCloud(input_api, output_api)