[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[eric at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit d89989e53e1ac4bce957d37ff31fa6d08da3733b
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Feb 26 16:19:43 2010 +0000

    2010-02-26  Chris Jerdonek  <cjerdonek at webkit.org>
    
            Reviewed by Eric Seidel.
    
            Changed the diff_parser module to log to a module-specific
            logging.logger rather than the root logger.
    
            https://bugs.webkit.org/show_bug.cgi?id=35391
    
            * Scripts/webkitpy/diff_parser.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55284 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index e776699..75d6071 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-02-26  Chris Jerdonek  <cjerdonek at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        Changed the diff_parser module to log to a module-specific
+        logging.logger rather than the root logger.
+
+        https://bugs.webkit.org/show_bug.cgi?id=35391
+
+        * Scripts/webkitpy/diff_parser.py:
+
 2010-02-26  Csaba Osztrogonác  <ossy at webkit.org>
 
         Reviewed by Kenneth Rohde Christiansen.
diff --git a/WebKitTools/Scripts/webkitpy/diff_parser.py b/WebKitTools/Scripts/webkitpy/diff_parser.py
index 7dce7e8..09e54db 100644
--- a/WebKitTools/Scripts/webkitpy/diff_parser.py
+++ b/WebKitTools/Scripts/webkitpy/diff_parser.py
@@ -31,6 +31,7 @@
 import logging
 import re
 
+_log = logging.getLogger("webkitpy.diff_parser")
 
 _regexp_compile_cache = {}
 
@@ -138,7 +139,8 @@ class DiffParser:
             lines_changed = match(r"^@@ -(?P<OldStartLine>\d+)(,\d+)? \+(?P<NewStartLine>\d+)(,\d+)? @@", line)
             if lines_changed:
                 if state != _DECLARED_FILE_PATH and state != _PROCESSING_CHUNK:
-                    logging.error('Unexpected line change without file path declaration: %r' % line)
+                    _log.error('Unexpected line change without file path '
+                               'declaration: %r' % line)
                 old_diff_line = int(lines_changed.group('OldStartLine'))
                 new_diff_line = int(lines_changed.group('NewStartLine'))
                 state = _PROCESSING_CHUNK
@@ -159,4 +161,5 @@ class DiffParser:
                     # Nothing to do.  We may still have some added lines.
                     pass
                 else:
-                    logging.error('Unexpected diff format when parsing a chunk: %r' % line)
+                    _log.error('Unexpected diff format when parsing a '
+                               'chunk: %r' % line)

-- 
WebKit Debian packaging