commit 5011a68051593060b93a303142245875efdb2938
author Katherine Threlkeld <kathrelkeld@chromium.org> Fri Jan 30 14:06:48 2015 -0800
committer ChromeOS Commit Bot <chromeos-commit-bot@chromium.org> Mon Feb 02 21:14:57 2015 +0000
tree 064ea9415197a589808aa443e876c2c655a5b4c7
parent 661c1e7c808158e0b7112f25a6d5409ecd68bb1a

Fix crosdl wrapper to correctly find recovery image file.

A gsutil change has broken the part of this wrapper which calls gsutil and
downloads an image file.

BUG=None
TEST=Ran it

Change-Id: I5870a544189598867cf2eb6b53341c8677d3d6a0
Reviewed-on: https://chromium-review.googlesource.com/245080
Tested-by: Katherine Threlkeld <kathrelkeld@chromium.org>
Reviewed-by: Mussa Kiroga <mussa@chromium.org>
Commit-Queue: Katherine Threlkeld <kathrelkeld@chromium.org>

provingground/crosdl.py

diff --git a/provingground/crosdl.py b/provingground/crosdl.py
index 8e9763c..164331a 100755
--- a/provingground/crosdl.py
+++ b/provingground/crosdl.py
@@ -224,7 +224,7 @@
   # Disallow installing anything that isn't an image.
   installing = installing_one or installing_many or installing_ip
   if not is_image and installing:
-    print ('Can only copy to usb or ip if downloading an image.  See help.')
+    print 'Can only copy to usb or ip if downloading an image.  See help.'
     return 1
 
   # Request sudo permissions if installing later.
@@ -271,9 +271,7 @@
       elif download_type == FACTORY:
         file_search = '%s*factory*.zip' % folder
       else: # RECOVERY
-        file_search = '%s*recovery*%s*%s*.bin' % (folder, channel, mp_str)
-        file_search_2 = ('%schromeos-signing*/*recovery*%s*%s*.bin'
-                         % (folder, channel, mp_str))
+        file_search = '%s*recovery*.bin' % folder
 
       # Output error if no files found
       def _no_file_error(message):
@@ -293,16 +291,8 @@
       try:
         possible_files = subprocess.check_output(['gsutil', 'ls', file_search])
       except subprocess.CalledProcessError:
-        if download_type == RECOVERY:
-          try:
-            possible_files = subprocess.check_output(['gsutil', 'ls',
-                                                      file_search_2])
-          except subprocess.CalledProcessError:
-            _no_file_error('Could not find file but found folder.')
-            return 1
-        else:
-          _no_file_error('Could not find file but found folder.')
-          return 1
+        _no_file_error('Could not find file but found folder.')
+        return 1
 
       # Locate exact file_name.
       possible_files = possible_files.splitlines()
@@ -316,8 +306,7 @@
       try:
         subprocess.call(['gsutil', 'cp', gsfile_path, folder_path])
       except subprocess.CalledProcessError:
-        print ('gsutil error.  Try running this command outside of '
-               'chroot?')
+        print 'gsutil error.  Try running this command outside of chroot?'
         output_str[board] = '%s: Could not run gsutil command.' % board
         return 1