[SCM] WebKit Debian packaging branch, webkit-1.1, updated. upstream/1.1.17-1283-gcf603cf
eric at webkit.org
eric at webkit.org
Tue Jan 5 23:40:44 UTC 2010
The following commit has been merged in the webkit-1.1 branch:
commit e8cc15b4d17c4d02aa730eebf79b4b3c0b773c24
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 2 09:43:14 2009 +0000
2009-12-02 Eric Seidel <eric at webkit.org>
Reviewed by Adam Barth.
build-queue is throwing exceptions and complaining about
lack of --no-update on build-attachment. Make it stop.
* Scripts/modules/buildsteps.py:
* Scripts/modules/commands/download.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51593 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 6290037..959b908 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,13 @@
+2009-12-02 Eric Seidel <eric at webkit.org>
+
+ Reviewed by Adam Barth.
+
+ build-queue is throwing exceptions and complaining about
+ lack of --no-update on build-attachment. Make it stop.
+
+ * Scripts/modules/buildsteps.py:
+ * Scripts/modules/commands/download.py:
+
2009-12-02 Adam Barth <abarth at webkit.org>
Unreviewed "build" fix. Forgot to declare my variables. :(
diff --git a/WebKitTools/Scripts/modules/buildsteps.py b/WebKitTools/Scripts/modules/buildsteps.py
index edde38c..d796b3a 100644
--- a/WebKitTools/Scripts/modules/buildsteps.py
+++ b/WebKitTools/Scripts/modules/buildsteps.py
@@ -43,6 +43,7 @@ class BuildSteps:
make_option("--no-clean", action="store_false", dest="clean", default=True, help="Don't check if the working directory is clean before applying patches"),
]
+ # FIXME: These distinctions are bogus. We need a better model for handling options.
@staticmethod
def build_options():
return [
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index 2a1347a..ecaadd0 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -266,7 +266,7 @@ class CheckStyle(AbstractPatchProcessingCommand):
sequence.run_and_handle_errors()
-class BuildAttachmentSequence(LandingSequence):
+class BuildAttachmentSequence(ConditionalLandingSequence):
def __init__(self, patch, options, tool):
LandingSequence.__init__(self, patch, options, tool)
@@ -283,6 +283,7 @@ class BuildAttachment(AbstractPatchProcessingCommand):
def __init__(self):
options = BuildSteps.cleaning_options()
options += BuildSteps.build_options()
+ options += BuildSteps.land_options()
AbstractPatchProcessingCommand.__init__(self, "Apply and build patches from bugzilla", "ATTACHMENT_ID [ATTACHMENT_IDS]", options)
def _fetch_list_of_patches_to_process(self, options, args, tool):
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list