[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373
abarth at webkit.org
abarth at webkit.org
Thu Apr 8 00:29:05 UTC 2010
The following commit has been merged in the webkit-1.2 branch:
commit dc3d372a24c62afc7dcb3510292a8ff4246ef4a9
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date: Wed Dec 9 18:11:44 2009 +0000
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...
* Scripts/modules/commands/download.py:
* Scripts/modules/logging_unittest.py:
* Scripts/modules/workqueue.py:
git-svn-id: http://svn.webkit.org/repository/webkit/trunk@51903 268f45cc-cd09-0410-ab3c-d52691b4dbfc
diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index b4f0581..4a8e330 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,5 +1,14 @@
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...
+
+ * Scripts/modules/commands/download.py:
+ * Scripts/modules/logging_unittest.py:
+ * Scripts/modules/workqueue.py:
+
+2009-12-09 Adam Barth <abarth at webkit.org>
+
Reviewed by Eric Seidel.
[bzt] Remove unused PatchCollection class
diff --git a/WebKitTools/Scripts/modules/commands/download.py b/WebKitTools/Scripts/modules/commands/download.py
index b8c8ba3..0310d6b 100644
--- a/WebKitTools/Scripts/modules/commands/download.py
+++ b/WebKitTools/Scripts/modules/commands/download.py
@@ -36,11 +36,11 @@ from modules.bugzilla import parse_bug_id
from modules.buildsteps import 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
from modules.grammar import pluralize
from modules.landingsequence import LandingSequence
from modules.logging import error, log
from modules.multicommandtool import Command
-from modules.processutils import ScriptError
from modules.stepsequence import StepSequence
diff --git a/WebKitTools/Scripts/modules/logging_unittest.py b/WebKitTools/Scripts/modules/logging_unittest.py
index 0e7ef79..b09a563 100644
--- a/WebKitTools/Scripts/modules/logging_unittest.py
+++ b/WebKitTools/Scripts/modules/logging_unittest.py
@@ -32,8 +32,8 @@ import StringIO
import tempfile
import unittest
+from modules.executive import ScriptError
from modules.logging import *
-from modules.processutils import ScriptError
class LoggingTest(unittest.TestCase):
diff --git a/WebKitTools/Scripts/modules/workqueue.py b/WebKitTools/Scripts/modules/workqueue.py
index 51af47c..f8cbba8 100644
--- a/WebKitTools/Scripts/modules/workqueue.py
+++ b/WebKitTools/Scripts/modules/workqueue.py
@@ -34,8 +34,8 @@ import traceback
from datetime import datetime, timedelta
+from modules.executive import ScriptError
from modules.logging import log, OutputTee
-from modules.processutils import ScriptError
from modules.statusbot import StatusBot
class WorkQueueDelegate:
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list