[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[eric at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 031113ac9fd968dac08b494cb5f83cb4f3f6431a
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 7 04:22:35 2011 +0000

    2011-01-06  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            StyleQueue fails to report errors when patches have many files
            https://bugs.webkit.org/show_bug.cgi?id=52042
    
            This is one of at least two errors preventing style error reporting at the moment.
            When we moved to passing the list of files to check explicitly,
            we started to exceed the 500 character TEXT field limit for our AppEngine model object.
            We could change the type of the QueueStatus.message type, or we could
            just teach statusserver.py how to clamp values (and warn when it does).
            I chose the latter path.
    
            * Scripts/webkitpy/common/net/statusserver.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75225 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 4633f99..a444338 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,19 @@
+2011-01-06  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        StyleQueue fails to report errors when patches have many files
+        https://bugs.webkit.org/show_bug.cgi?id=52042
+
+        This is one of at least two errors preventing style error reporting at the moment.
+        When we moved to passing the list of files to check explicitly,
+        we started to exceed the 500 character TEXT field limit for our AppEngine model object.
+        We could change the type of the QueueStatus.message type, or we could
+        just teach statusserver.py how to clamp values (and warn when it does).
+        I chose the latter path.
+
+        * Scripts/webkitpy/common/net/statusserver.py:
+
 2011-01-06  Steve Falkenburg  <sfalken at apple.com>
 
         Reviewed by Stephanie Lewis.
diff --git a/Tools/Scripts/webkitpy/common/net/statusserver.py b/Tools/Scripts/webkitpy/common/net/statusserver.py
index 64dd77b..abd298a 100644
--- a/Tools/Scripts/webkitpy/common/net/statusserver.py
+++ b/Tools/Scripts/webkitpy/common/net/statusserver.py
@@ -69,6 +69,13 @@ class StatusServer:
             return
         self._browser.add_file(results_file, "text/plain", "results.txt", 'results_file')
 
+    # 500 is the AppEngine limit for TEXT fields (which most of our fields are).
+    # Exceeding the limit will result in a 500 error from the server.
+    def _set_field(self, field_name, value, limit=500):
+        if len(value) > limit:
+            _log.warn("Attempted to set %s to value exceeding %s characters, truncating." % (field_name, limit))
+        self._browser[field_name] = value[:limit]
+
     def _post_status_to_server(self, queue_name, status, patch, results_file):
         if results_file:
             # We might need to re-wind the file if we've already tried to post it.
@@ -81,7 +88,7 @@ class StatusServer:
         if self.bot_id:
             self._browser["bot_id"] = self.bot_id
         self._add_patch(patch)
-        self._browser["status"] = status
+        self._set_field("status", status, limit=500)
         self._add_results_file(results_file)
         return self._browser.submit().read()  # This is the id of the newly created status object.
 

-- 
WebKit Debian packaging