[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 3d80ce4d8ba2b801071bfab4430c7e5391426f1e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Dec 9 22:25:35 2009 +0000

    2009-12-09  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            exception thrown when running apply-patches
            https://bugs.webkit.org/show_bug.cgi?id=32344
    
            The update step now takes a port option.  Once we finish the Steps
            refactoring, we won't have to worry about this kind of bug again.
    
            * Scripts/modules/commands/download.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51923 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 4a8e330..e95da06 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,17 @@
 2009-12-09  Adam Barth  <abarth at webkit.org>
 
+        Reviewed by Eric Seidel.
+
+        exception thrown when running apply-patches
+        https://bugs.webkit.org/show_bug.cgi?id=32344
+
+        The update step now takes a port option.  Once we finish the Steps
+        refactoring, we won't have to worry about this kind of bug again.
+
+        * Scripts/modules/commands/download.py:
+
+2009-12-09  Adam Barth  <abarth at webkit.org>
+
         Unreviewed.  Fix ScriptError includes.  I don't understand why these
         didn't throw during unit testing...
 
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 0310d6b..559c0ce 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -33,7 +33,7 @@ import os
 from optparse import make_option
 
 from modules.bugzilla import parse_bug_id
-from modules.buildsteps import BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, BuildStep, CheckStyleStep, PrepareChangelogStep
+from modules.buildsteps import CommandOptions, BuildSteps, EnsureBuildersAreGreenStep, CleanWorkingDirectoryStep, UpdateStep, BuildStep, CheckStyleStep, PrepareChangelogStep
 from modules.changelogs import ChangeLog
 from modules.comments import bug_comment_from_commit_text
 from modules.executive import ScriptError
@@ -95,6 +95,7 @@ class WebKitApplyingScripts:
         return [
             make_option("--no-update", action="store_false", dest="update", default=True, help="Don't update the working directory before applying patches"),
             make_option("--local-commit", action="store_true", dest="local_commit", default=False, help="Make a local commit for each applied patch"),
+            CommandOptions.port,
         ]
 
     @staticmethod

-- 
WebKit Debian packaging