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

[commit-queue at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit c1466217e6074b0f274aef8e8cc5da0f9b734de0
Author: commit-queue at webkit.org <commit-queue at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Tue Sep 14 01:37:22 2010 +0000

    2010-09-13  Mihai Parparita  <mihaip at chromium.org>
    
            Reviewed by Adam Barth.
    
            Upload results when cq patch landing fails
            https://bugs.webkit.org/show_bug.cgi?id=45683
    
            Include script errors when CommitQueue._land fails.
    
            * Scripts/webkitpy/tool/commands/queues.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@67428 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 61302f7..b3e3b07 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,14 @@
+2010-09-13  Mihai Parparita  <mihaip at chromium.org>
+
+        Reviewed by Adam Barth.
+
+        Upload results when cq patch landing fails
+        https://bugs.webkit.org/show_bug.cgi?id=45683
+        
+        Include script errors when CommitQueue._land fails.
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+
 2010-09-13  Chris Fleizach  <cfleizach at apple.com>
 
         Reviewed by David Kilzer.
diff --git a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
index 248d1e5..f21df94 100644
--- a/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
+++ b/WebKitTools/Scripts/webkitpy/tool/commands/queues.py
@@ -251,6 +251,8 @@ class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler):
             self._did_pass(patch)
             return True
         except ScriptError, e:
+            failure_log = self._log_from_script_error_for_upload(e)
+            self._update_status("Unable to land patch", patch=patch, results_file=failure_log)
             if first_run:
                 return False
             self._did_fail(patch)
@@ -259,7 +261,7 @@ 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)
+            self._update_status("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.

-- 
WebKit Debian packaging