[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 7ab2e49116f7aad8c7dc56cf42a7a088fd18dc1d
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Jan 5 19:28:50 2010 +0000

    2010-01-05  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Darin Adler.
    
            Fix obscure queue crash in queueengine
            https://bugs.webkit.org/show_bug.cgi?id=33196
    
            Sometimes we get an exception that can't be stringified.  For example:
    
            AttributeError: 'ParseError' object has no attribute 'msg'
    
            In these cases, the whole queue dies because we're in the global
            exception handler.  Instead of dieing here, we should just print a less
            informative message to the console.  We're already printing the whole
            backtrace anyway, so there's not much point to stringifying the
            exception anyway.
    
            * Scripts/webkitpy/queueengine.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@52814 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b9b7679..4b1b9c8 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,22 @@
+2010-01-05  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Darin Adler.
+
+        Fix obscure queue crash in queueengine
+        https://bugs.webkit.org/show_bug.cgi?id=33196
+
+        Sometimes we get an exception that can't be stringified.  For example:
+
+        AttributeError: 'ParseError' object has no attribute 'msg'
+
+        In these cases, the whole queue dies because we're in the global
+        exception handler.  Instead of dieing here, we should just print a less
+        informative message to the console.  We're already printing the whole
+        backtrace anyway, so there's not much point to stringifying the
+        exception anyway.
+
+        * Scripts/webkitpy/queueengine.py:
+
 2010-01-05  Dominic Mazzoni  <dmazzoni at google.com>
 
         Reviewed by Darin Adler.
diff --git a/WebKitTools/Scripts/webkitpy/queueengine.py b/WebKitTools/Scripts/webkitpy/queueengine.py
index c83d641..59180ff 100644
--- a/WebKitTools/Scripts/webkitpy/queueengine.py
+++ b/WebKitTools/Scripts/webkitpy/queueengine.py
@@ -115,7 +115,7 @@ class QueueEngine:
             except Exception, e:
                 traceback.print_exc()
                 # Don't try tell the status bot, in case telling it causes an exception.
-                self._sleep("Exception while preparing queue: %s." % e)
+                self._sleep("Exception while preparing queue")
         # Never reached.
         self._ensure_work_log_closed()
 

-- 
WebKit Debian packaging