[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 32371a8788d2a58805fbe4755a0d373335fbfb96
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 2 10:51:20 2009 +0000

    2009-12-02  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] build-attachment shouldn't check whether the builders are red
            https://bugs.webkit.org/show_bug.cgi?id=32062
    
            build-attachment doesn't touch the remote repository, so there isn't a
            need to hold off when the builders are red.
    
            * Scripts/modules/commands/download.py:
            * Scripts/modules/landingsequence.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51596 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 33bda4d..74be115 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,16 @@
+2009-12-02  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] build-attachment shouldn't check whether the builders are red
+        https://bugs.webkit.org/show_bug.cgi?id=32062
+
+        build-attachment doesn't touch the remote repository, so there isn't a
+        need to hold off when the builders are red.
+
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/landingsequence.py:
+
 2009-12-02  Eric Seidel  <eric at webkit.org>
 
         Reviewed by Adam Barth.
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index ecaadd0..a45632c 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -129,6 +129,7 @@ class LandDiffSequence(ConditionalLandingSequence):
         ConditionalLandingSequence.__init__(self, patch, options, tool)
 
     def run(self):
+        self.check_builders()
         self.build()
         self.test()
         commit_log = self.commit()
diff --git a/WebKitTools/Scripts/modules/landingsequence.py b/WebKitTools/Scripts/modules/landingsequence.py
index 7655eaa..ecb231e 100644
--- a/WebKitTools/Scripts/modules/landingsequence.py
+++ b/WebKitTools/Scripts/modules/landingsequence.py
@@ -51,6 +51,7 @@ class LandingSequence:
         self.clean()
         self.update()
         self.apply_patch()
+        self.check_builders()
         self.build()
         self.test()
         commit_log = self.commit()
@@ -82,10 +83,10 @@ class LandingSequence:
         log("Processing patch %s from bug %s." % (self._patch["id"], self._patch["bug_id"]))
         self._tool.scm().apply_patch(self._patch, force=self._options.non_interactive)
 
-    def build(self):
-        # Make sure the tree is still green after updating, before building this patch.
-        # The first patch ends up checking tree status twice, but that's OK.
+    def check_builders(self):
         self._tool.steps.ensure_builders_are_green(self._tool.buildbot, self._options)
+
+    def build(self):
         self._tool.steps.build_webkit(quiet=self._options.quiet, port=self._port)
 
     def test(self):
@@ -120,6 +121,10 @@ class ConditionalLandingSequence(LandingSequence):
         if self._options.update:
             LandingSequence.update(self)
 
+    def check_builders(self):
+        if self._options.build:
+            LandingSequence.check_builders(self)
+
     def build(self):
         if self._options.build:
             LandingSequence.build(self)

-- 
WebKit Debian packaging