[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 abfe31ad2fd27305f034dcb264836a1ee1cd1b5e
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Sat Nov 21 15:37:56 2009 +0000

    2009-11-21  Adam Barth  <abarth at webkit.org>
    
            Unreviewed "build" fix.  Turns out I was testing the wrong copy of
            WebKitTools.
    
            * Scripts/modules/commands/download.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51282 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index a6ff672..5391bb3 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,12 @@
 2009-11-21  Adam Barth  <abarth at webkit.org>
 
+        Unreviewed "build" fix.  Turns out I was testing the wrong copy of
+        WebKitTools.
+
+        * Scripts/modules/commands/download.py:
+
+2009-11-21  Adam Barth  <abarth at webkit.org>
+
         Reviewed by Eric Seidel.
 
         Convert check-style to use LandingSequence
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 1b88cd6..1e19459 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -243,7 +243,7 @@ class AbstractPatchProcessingCommand(Command):
 
 class CheckStyleSequence(LandingSequence):
     def __init__(self, patch, options, tool):
-        ConditionalLandingSequence.__init__(self, patch, options, tool)
+        LandingSequence.__init__(self, patch, options, tool)
 
     def run(self):
         self.clean()
@@ -260,6 +260,7 @@ class CheckStyle(AbstractPatchProcessingCommand):
     name = "check-style"
     def __init__(self):
         options = WebKitLandingScripts.cleaning_options()
+        options += WebKitLandingScripts.build_options()
         AbstractPatchProcessingCommand.__init__(self, "Runs check-webkit-style on the specified attachments.", "ATTACHMENT_ID [ATTACHMENT_IDS]", options)
 
     def _fetch_list_of_patches_to_process(self, options, args, tool):

-- 
WebKit Debian packaging