Don't crash on corrupted archive.

tools/bisect-builds.py

 #!/usr/bin/env python
 # Copyright (c) 2012 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.
 
 """Snapshot Build Bisect Tool
 
 This script bisects a snapshot archive using binary search. It starts at
 a bad revision (it will try to guess HEAD) and asks for a last known-good
 revision. It will then binary search across this revision range by downloading,
@@ skipping 222 matching lines @@
         pass
     return final_list
 
 def UnzipFilenameToDir(filename, dir):
   """Unzip |filename| to directory |dir|."""
   cwd = os.getcwd()
   if not os.path.isabs(filename):
     filename = os.path.join(cwd, filename)
   zf = zipfile.ZipFile(filename)
   # Make base.
-  try:
-    if not os.path.isdir(dir):
-      os.mkdir(dir)
-    os.chdir(dir)
-    # Extract files.
-    for info in zf.infolist():
-      name = info.filename
-      if name.endswith('/'):  # dir
-        if not os.path.isdir(name):
-          os.makedirs(name)
-      else:  # file
-        dir = os.path.dirname(name)
-        if not os.path.isdir(dir):
-          os.makedirs(dir)
-        out = open(name, 'wb')
-        out.write(zf.read(name))
-        out.close()
-      # Set permissions. Permission info in external_attr is shifted 16 bits.
-      os.chmod(name, info.external_attr >> 16L)
-    os.chdir(cwd)
-  except Exception, e:
-    print >>sys.stderr, e
-    sys.exit(1)
+  if not os.path.isdir(dir):
+    os.mkdir(dir)
+  os.chdir(dir)
+  # Extract files.
+  for info in zf.infolist():
+    name = info.filename
+    if name.endswith('/'):  # dir
+      if not os.path.isdir(name):
+        os.makedirs(name)
+    else:  # file
+      dir = os.path.dirname(name)
+      if not os.path.isdir(dir):
+        os.makedirs(dir)
+      out = open(name, 'wb')
+      out.write(zf.read(name))
+      out.close()
+    # Set permissions. Permission info in external_attr is shifted 16 bits.
+    os.chmod(name, info.external_attr >> 16L)
+  os.chdir(cwd)
 
 
 def FetchRevision(context, rev, filename, quit_event=None, progress_event=None):
   """Downloads and unzips revision |rev|.
   @param context A PathContext instance.
   @param rev The Chromium revision number/tag to download.
   @param filename The destination for the downloaded file.
   @param quit_event A threading.Event which will be set by the master thread to
                     indicate that the download should be aborted.
   @param progress_event A threading.Event which will be set by the master thread
@@ skipping 193 matching lines @@
 
     up_pivot = int((bad - pivot) / 2) + pivot
     up_fetch = None
     if up_pivot != pivot and up_pivot != bad:
       up_rev = revlist[up_pivot]
       up_fetch = DownloadJob(context, 'up_fetch', up_rev,
                              _GetDownloadPath(up_rev))
       up_fetch.Start()
 
     # Run test on the pivot revision.
-    (status, stdout, stderr) = RunRevision(context,
-                                           rev,
-                                           zipfile,
-                                           profile,
-                                           num_runs,
-                                           try_args)
+    status = None
+    stdout = None
+    stderr = None
+    try:
+      (status, stdout, stderr) = RunRevision(context,
+                                             rev,
+                                             zipfile,
+                                             profile,
+                                             num_runs,
+                                             try_args)
+    except Exception, e:
+      print >>sys.stderr, e
     os.unlink(zipfile)
     zipfile = None
 
     # Call the evaluate function to see if the current revision is good or bad.
     # On that basis, kill one of the background downloads and complete the
     # other, as described in the comments above.
     try:
       answer = evaluate(rev, official_builds, status, stdout, stderr)
       if answer == 'g':
         good = pivot
@@ skipping 174 matching lines @@
     print '  ' + WEBKIT_CHANGELOG_URL % (first_known_bad_webkit_rev,
                                          last_known_good_webkit_rev)
   print 'CHANGELOG URL:'
   if opts.official_builds:
     print OFFICIAL_CHANGELOG_URL % (last_known_good_rev, first_known_bad_rev)
   else:
     print '  ' + CHANGELOG_URL % (last_known_good_rev, first_known_bad_rev)
 
 if __name__ == '__main__':
   sys.exit(main())