[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.3.3-9427-gc2be6fc

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 12c021b1d2143a639744da6a5c330c521d1aee0e
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Sep 11 02:33:08 2010 +0000

    2010-09-10  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Eric Seidel.
    
            Update queue status when patches fail their first land attempt
            https://bugs.webkit.org/show_bug.cgi?id=45583
    
            Add a few more _update_status calls to make it more obvious if a patch is
            being retried because tests failed.
    
            * Scripts/webkitpy/tool/commands/queues.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67269 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 1b21784..23c234e 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,15 @@
+2010-09-10  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Eric Seidel.
+
+        Update queue status when patches fail their first land attempt
+        https://bugs.webkit.org/show_bug.cgi?id=45583
+
+        Add a few more _update_status calls to make it more obvious if a patch is 
+        being retried because tests failed.
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+
 2010-09-10  Balazs Kelemen  <kb at inf.u-szeged.hu>
 
         Reviewed by Andreas Kling.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
index 4d2a9df..127e7ef 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
@@ -213,7 +213,7 @@ class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler):
                 "--quiet"])
         except ScriptError, e:
             failure_log = self._log_from_script_error_for_upload(e)
-            self._update_status("Unable to successfully build and test", results_file=failure_log)
+            self._update_status("Unable to successfully do a clean build and test", results_file=failure_log)
             return False
         return True
 
@@ -260,11 +260,13 @@ class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler):
     def process_work_item(self, patch):
         self._cc_watchers(patch.bug_id())
         if not self._land(patch, first_run=True):
+            self._update_status("Patch could not be landed with first attempt, doing a clean build as a sanity check", patch)
             # The patch failed to land, but the bots were green. It's possible
             # that the bots were behind. To check that case, we try to build and
             # test ourselves.
             if not self._can_build_and_test():
                 return False
+            self._update_status("Clean build succeeded, trying patch again", patch)
             # Hum, looks like the patch is actually bad. Of course, we could
             # have been bitten by a flaky test the first time around.  We try
             # to land again.  If it fails a second time, we're pretty sure its

-- 
WebKit Debian packaging