[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[abarth at webkit.org]

The following commit has been merged in the webkit-1.2 branch:
commit 7d49eef9062bdf2b8718bae18f97f83053717581
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Nov 27 07:55:31 2009 +0000

    2009-11-26  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            [bzt] Kill WebKitLandingScripts
            https://bugs.webkit.org/show_bug.cgi?id=31904
    
            Step 2: Kill ensure_builders_are_green.
    
            * Scripts/modules/buildsteps.py:
            * Scripts/modules/commands/download.py:
            * Scripts/modules/landingsequence.py:
            * Scripts/modules/webkitlandingscripts.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51432 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 512a328..7f86d78 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -5,6 +5,20 @@
         [bzt] Kill WebKitLandingScripts
         https://bugs.webkit.org/show_bug.cgi?id=31904
 
+        Step 2: Kill ensure_builders_are_green.
+
+        * Scripts/modules/buildsteps.py:
+        * Scripts/modules/commands/download.py:
+        * Scripts/modules/landingsequence.py:
+        * Scripts/modules/webkitlandingscripts.py:
+
+2009-11-26  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        [bzt] Kill WebKitLandingScripts
+        https://bugs.webkit.org/show_bug.cgi?id=31904
+
         Step 1: Kill prepare_clean_working_directory and run_webkit_tests.
 
         * Scripts/bugzilla-tool:
diff --git a/WebKitTools/Scripts/modules/buildsteps.py b/WebKitTools/Scripts/modules/buildsteps.py
index f215f1a..51f4f1b 100644
--- a/WebKitTools/Scripts/modules/buildsteps.py
+++ b/WebKitTools/Scripts/modules/buildsteps.py
@@ -28,6 +28,7 @@
 
 import os
 
+from modules.logging import error
 from modules.webkitlandingscripts import WebKitLandingScripts
 from modules.webkitport import WebKitPort
 
@@ -48,3 +49,8 @@ class BuildSteps:
         if fail_fast:
             args.append("--exit-after-n-failures=1")
         WebKitLandingScripts.run_and_throw_if_fail(args)
+
+    def ensure_builders_are_green(self, buildbot, options):
+        if not options.check_builders or buildbot.core_builders_are_green():
+            return
+        error("Builders at %s are red, please do not commit.  Pass --ignore-builders to bypass this check." % (buildbot.buildbot_host))
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 181c95c..9c152f0 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -198,7 +198,7 @@ class LandDiff(Command):
     def execute(self, options, args, tool):
         bug_id = (args and args[0]) or parse_bug_id(tool.scm().create_patch())
 
-        WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
+        tool.steps.ensure_builders_are_green(tool.buildbot, options)
 
         os.chdir(tool.scm().checkout_root)
         self.update_changelogs_with_reviewer(options.reviewer, bug_id, tool)
@@ -300,7 +300,7 @@ class BuildAttachment(AbstractPatchProcessingCommand):
 
     def _prepare_to_process(self, options, args, tool):
         # Check the tree status first so we can fail early.
-        WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
+        tool.steps.ensure_builders_are_green(tool.buildbot, options)
 
     def _process_patch(self, patch, options, args, tool):
         sequence = BuildAttachmentSequence(patch, options, tool)
@@ -316,7 +316,7 @@ class AbstractPatchLandingCommand(AbstractPatchProcessingCommand):
 
     def _prepare_to_process(self, options, args, tool):
         # Check the tree status first so we can fail early.
-        WebKitLandingScripts.ensure_builders_are_green(tool.buildbot, options)
+        tool.steps.ensure_builders_are_green(tool.buildbot, options)
 
     def _process_patch(self, patch, options, args, tool):
         sequence = ConditionalLandingSequence(patch, options, tool)
diff --git a/WebKitTools/Scripts/modules/landingsequence.py b/WebKitTools/Scripts/modules/landingsequence.py
index 50852bc..9a5d453 100644
--- a/WebKitTools/Scripts/modules/landingsequence.py
+++ b/WebKitTools/Scripts/modules/landingsequence.py
@@ -80,7 +80,7 @@ class LandingSequence:
     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.
-        WebKitLandingScripts.ensure_builders_are_green(self._tool.buildbot, self._options)
+        self._tool.steps.ensure_builders_are_green(self._tool.buildbot, self._options)
         WebKitLandingScripts.build_webkit(quiet=self._options.quiet, port=self._port)
 
     def test(self):
diff --git a/WebKitTools/Scripts/modules/webkitlandingscripts.py b/WebKitTools/Scripts/modules/webkitlandingscripts.py
index fe4e271..245252e 100644
--- a/WebKitTools/Scripts/modules/webkitlandingscripts.py
+++ b/WebKitTools/Scripts/modules/webkitlandingscripts.py
@@ -123,10 +123,5 @@ class WebKitLandingScripts:
         log("Building WebKit")
         cls.run_and_throw_if_fail(port.build_webkit_command(), quiet)
 
-    @staticmethod
-    def ensure_builders_are_green(buildbot, options):
-        if not options.check_builders or buildbot.core_builders_are_green():
-            return
-        error("Builders at %s are red, please do not commit.  Pass --ignore-builders to bypass this check." % (buildbot.buildbot_host))
 
 

-- 
WebKit Debian packaging