commit | 7f2e05e9a3f44528d9fa624da9386b01ccaa54a6 | [log] [tgz] |
---|---|---|
author | Yasuhiro Matsuda <mazda@google.com> | Thu Aug 06 01:48:34 2015 +0000 |
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu Aug 06 01:48:34 2015 +0000 |
tree | 4288f9853354ba0325279a44ec52b543a2301ec8 | |
parent | 1ada513f5042a13fff3fb64671d110defb6725fc [diff] | |
parent | f3d0d42f1a38906e0e80ab96368ad01b8a58f8d0 [diff] |
Merge "Fix incorrect exception handling in 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)