diff options
| author | mikecase <mikecase@chromium.org> | 2016-01-15 11:38:22 -0800 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2016-01-15 19:39:29 +0000 |
| commit | 8d3d8dd4bbf5d0876f3c787b447e97dba971795a (patch) | |
| tree | d0336b9f3f79860e903985723f1e656de7ffcc89 | |
| parent | a65348f3c3b376853a5ce60b9273894b0ca28787 (diff) | |
| download | chromium_src-8d3d8dd4bbf5d0876f3c787b447e97dba971795a.zip chromium_src-8d3d8dd4bbf5d0876f3c787b447e97dba971795a.tar.gz chromium_src-8d3d8dd4bbf5d0876f3c787b447e97dba971795a.tar.bz2 | |
[Android] Fix for crash if writing logcat to preexisting dir.
Change to catapult: https://codereview.chromium.org/1597533002/
BUG=578157
NOPRESUBMIT=true
Review URL: https://codereview.chromium.org/1586273003
Cr-Commit-Position: refs/heads/master@{#369814}
| -rw-r--r-- | build/android/devil/android/logcat_monitor.py | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/build/android/devil/android/logcat_monitor.py b/build/android/devil/android/logcat_monitor.py index 179002a..24430d4 100644 --- a/build/android/devil/android/logcat_monitor.py +++ b/build/android/devil/android/logcat_monitor.py @@ -4,6 +4,7 @@ # pylint: disable=unused-argument +import errno import logging import os import re @@ -194,7 +195,11 @@ class LogcatMonitor(object): """ self._StopRecording() if self._record_file and self._output_file: - os.makedirs(os.path.dirname(self._output_file)) + try: + os.makedirs(os.path.dirname(self._output_file)) + except OSError as e: + if e.errno != errno.EEXIST: + raise shutil.copy(self._record_file.name, self._output_file) def Close(self): |