Title: [90016] trunk/Tools
- Revision
- 90016
- Author
- [email protected]
- Date
- 2011-06-29 07:18:40 -0700 (Wed, 29 Jun 2011)
Log Message
Reviewed by Martin Robinson.
[webkitpy] Executive.running_pids() sometimes doesn't correctly process "ps" output
https://bugs.webkit.org/show_bug.cgi?id=63624
* Scripts/webkitpy/common/system/executive.py: In some cases the
ps output lines can contain one or more leading white-spaces, so
strip it before splitting the pid and command name.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (90015 => 90016)
--- trunk/Tools/ChangeLog 2011-06-29 14:12:54 UTC (rev 90015)
+++ trunk/Tools/ChangeLog 2011-06-29 14:18:40 UTC (rev 90016)
@@ -1,3 +1,14 @@
+2011-06-29 Philippe Normand <[email protected]>
+
+ Reviewed by Martin Robinson.
+
+ [webkitpy] Executive.running_pids() sometimes doesn't correctly process "ps" output
+ https://bugs.webkit.org/show_bug.cgi?id=63624
+
+ * Scripts/webkitpy/common/system/executive.py: In some cases the
+ ps output lines can contain one or more leading white-spaces, so
+ strip it before splitting the pid and command name.
+
2011-06-29 Noel Gordon <[email protected]>
Reviewed by Kent Tamura.
Modified: trunk/Tools/Scripts/webkitpy/common/system/executive.py (90015 => 90016)
--- trunk/Tools/Scripts/webkitpy/common/system/executive.py 2011-06-29 14:12:54 UTC (rev 90015)
+++ trunk/Tools/Scripts/webkitpy/common/system/executive.py 2011-06-29 14:18:40 UTC (rev 90016)
@@ -303,7 +303,9 @@
stdout, _ = ps_process.communicate()
for line in stdout.splitlines():
try:
- pid, process_name = line.split(' ', 1)
+ # In some cases the line can contain one or more
+ # leading white-spaces, so strip it before split.
+ pid, process_name = line.strip().split(' ', 1)
if process_name_filter(process_name):
running_pids.append(int(pid))
except ValueError, e:
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
