commit a0ee2fdda81af34ca7712f62aa3bf387283a2c20
author Yasuhiro Matsuda <mazda@google.com> Thu Aug 06 12:33:32 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Aug 06 12:33:32 2015 +0000
tree 4288f9853354ba0325279a44ec52b543a2301ec8
parent 137edd9b873e85b69c96979d73ca94c41fe23ce2
parent 6343dfa989d8915cda71d3bfb6196c359f566639

am 7f2e05e9: Merge "Fix incorrect exception handling in perfboot.py"

* commit '7f2e05e9a3f44528d9fa624da9386b01ccaa54a6':
  Fix incorrect exception handling in perfboot.py

init/perfboot.py

diff --git a/init/perfboot.py b/init/perfboot.py
index 3d4940c..583d640 100755
--- a/init/perfboot.py
+++ b/init/perfboot.py
@@ -203,7 +203,7 @@
                 output_results(output, record_list, tags)
             if original_dropbox_max_files is not None:
                 restore_dropbox(device, original_dropbox_max_files)
-        except subprocess.CalledProcessError, RuntimeError:
+        except (subprocess.CalledProcessError, RuntimeError):
             pass
     atexit.register(cleanup)