[SCM] WebKit Debian packaging branch, webkit-1.3, updated. upstream/1.3.7-4207-g178b198

[eric at webkit.org]

The following commit has been merged in the webkit-1.3 branch:
commit f9a94b03eaad4953e8f804e7bec13be5291c246e
Author: eric at webkit.org <eric at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Fri Jan 14 01:51:57 2011 +0000

    2011-01-13  Eric Seidel  <eric at webkit.org>
    
            Reviewed by Adam Barth.
    
            results archives from commit-queue are too large to upload
            https://bugs.webkit.org/show_bug.cgi?id=52405
    
            * Scripts/webkitpy/common/system/filesystem.py:
            * Scripts/webkitpy/common/system/filesystem_mock.py:
            * Scripts/webkitpy/tool/commands/queues.py:
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75760 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index 2c53451..8a3a748 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,14 @@
+2011-01-13  Eric Seidel  <eric at webkit.org>
+
+        Reviewed by Adam Barth.
+
+        results archives from commit-queue are too large to upload
+        https://bugs.webkit.org/show_bug.cgi?id=52405
+
+        * Scripts/webkitpy/common/system/filesystem.py:
+        * Scripts/webkitpy/common/system/filesystem_mock.py:
+        * Scripts/webkitpy/tool/commands/queues.py:
+
 2011-01-13  Alejandro G. Castro  <alex at igalia.com>
 
         Reviewed by Martin Robinson.
diff --git a/Tools/Scripts/webkitpy/common/system/filesystem.py b/Tools/Scripts/webkitpy/common/system/filesystem.py
index 8830ea8..527b6bd 100644
--- a/Tools/Scripts/webkitpy/common/system/filesystem.py
+++ b/Tools/Scripts/webkitpy/common/system/filesystem.py
@@ -124,6 +124,9 @@ class FileSystem(object):
                 if retry_timeout_sec < 0:
                     raise e
 
+    def remove_tree(self, path, ignore_errors=False):
+        shutil.rmtree(path, ignore_errors)
+
     def read_binary_file(self, path):
         """Return the contents of the file at the given path as a byte string."""
         with file(path, 'rb') as f:
diff --git a/Tools/Scripts/webkitpy/common/system/filesystem_mock.py b/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
index c605cb2..809c4c6 100644
--- a/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
+++ b/Tools/Scripts/webkitpy/common/system/filesystem_mock.py
@@ -116,3 +116,6 @@ class MockFileSystem(object):
 
     def remove(self, path):
         del self.files[path]
+
+    def remove_tree(self, path, ignore_errors=False):
+        self.files = [file for file in self.files if not file.startswith(path)]
diff --git a/Tools/Scripts/webkitpy/tool/commands/queues.py b/Tools/Scripts/webkitpy/tool/commands/queues.py
index 90b2b4d..42321cf 100644
--- a/Tools/Scripts/webkitpy/tool/commands/queues.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queues.py
@@ -323,7 +323,11 @@ class CommitQueue(AbstractPatchQueue, StepSequenceErrorHandler, CommitQueueTaskD
         results_name, _ = os.path.splitext(os.path.basename(results_directory))
         # Note: We name the zip with the bug_id instead of patch_id to match work_item_log_path().
         zip_path = self._tool.workspace.find_unused_filename(self._log_directory(), "%s-%s" % (patch.bug_id(), results_name), "zip")
-        return self._tool.workspace.create_zip(zip_path, results_directory)
+        archive = self._tool.workspace.create_zip(zip_path, results_directory)
+        # Remove the results directory to prevent http logs, etc. from getting huge between runs.
+        # We could have create_zip remove the original, but this is more explicit.
+        self._tool.filesystem.remove_tree(results_directory, ignore_errors=True)
+        return archive
 
     def refetch_patch(self, patch):
         return self._tool.bugs.fetch_attachment(patch.id())

-- 
WebKit Debian packaging