Title: [88035] trunk/Tools
- Revision
- 88035
- Author
- [email protected]
- Date
- 2011-06-03 12:00:09 -0700 (Fri, 03 Jun 2011)
Log Message
2011-06-03 Dirk Pranke <[email protected]>
Reviewed by Tony Chang.
nrwt: fix duplicate logging regression
https://bugs.webkit.org/show_bug.cgi?id=61981
* Scripts/webkitpy/layout_tests/layout_package/printing.py:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (88034 => 88035)
--- trunk/Tools/ChangeLog 2011-06-03 18:48:15 UTC (rev 88034)
+++ trunk/Tools/ChangeLog 2011-06-03 19:00:09 UTC (rev 88035)
@@ -1,3 +1,12 @@
+2011-06-03 Dirk Pranke <[email protected]>
+
+ Reviewed by Tony Chang.
+
+ nrwt: fix duplicate logging regression
+ https://bugs.webkit.org/show_bug.cgi?id=61981
+
+ * Scripts/webkitpy/layout_tests/layout_package/printing.py:
+
2011-06-03 Robert Kroeger <[email protected]>
Reviewed by Adam Barth.
Modified: trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py (88034 => 88035)
--- trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py 2011-06-03 18:48:15 UTC (rev 88034)
+++ trunk/Tools/Scripts/webkitpy/layout_tests/layout_package/printing.py 2011-06-03 19:00:09 UTC (rev 88035)
@@ -217,13 +217,16 @@
self.switches = parse_print_options(options.print_options, options.verbose)
+ self._logging_handler = None
if self._stream.isatty() and not options.verbose:
self._update_interval_seconds = FAST_UPDATES_SECONDS
self._meter = metered_stream.MeteredStream(self._stream)
- self._logging_handler = _configure_logging(self._meter, options.verbose)
+ if configure_logging:
+ self._logging_handler = _configure_logging(self._meter, options.verbose)
else:
- self._logging_handler = _configure_logging(self._stream, options.verbose)
self._update_interval_seconds = SLOW_UPDATES_SECONDS
+ if configure_logging:
+ self._logging_handler = _configure_logging(self._stream, options.verbose)
def cleanup(self):
"""Restore logging configuration to its initial settings."""
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
