webkitpy: Missing PID in crashlog name should not be fatal (Follow-up fix)
authorjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2019 18:48:29 +0000 (18:48 +0000)
committerjbedard@apple.com <jbedard@apple.com@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Jan 2019 18:48:29 +0000 (18:48 +0000)
https://bugs.webkit.org/show_bug.cgi?id=193771

Unreviewed infrastructure fix.

* Scripts/webkitpy/port/darwin.py:
(DarwinPort._merge_crash_logs): Correct syntax for catching multiple exception types.

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@240483 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/port/darwin.py

index bc68e09..c6ea7ee 100644 (file)
@@ -1,3 +1,13 @@
+2019-01-25  Jonathan Bedard  <jbedard@apple.com>
+
+        webkitpy: Missing PID in crashlog name should not be fatal (Follow-up fix)
+        https://bugs.webkit.org/show_bug.cgi?id=193771
+
+        Unreviewed infrastructure fix.
+
+        * Scripts/webkitpy/port/darwin.py:
+        (DarwinPort._merge_crash_logs): Correct syntax for catching multiple exception types.
+
 2019-01-25  Alexey Proskuryakov  <ap@apple.com>
 
         * Scripts/webkitpy/common/config/contributors.json: Removing a stray comma.
index ebaf5b2..5beb06b 100644 (file)
@@ -104,7 +104,7 @@ class DarwinPort(ApplePort):
                 else:
                     process_name = test.split('-')[0]
                     pid = int(test.split('-')[1])
-            except IndexError, ValueError:
+            except (IndexError, ValueError):
                 continue
             if not any(entry[1] == process_name and entry[2] == pid for entry in crashed_processes):
                 # if this is a new crash, then append the logs