[SCM] WebKit Debian packaging branch, debian/experimental, updated. debian/1.3.8-1-1049-g2e11a8e

[abarth at webkit.org]

The following commit has been merged in the debian/experimental branch:
commit 804f218d53e63f983c9b5b166a263c94d245a434
Author: abarth at webkit.org <abarth at webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Thu Jan 6 11:31:08 2011 +0000

    2011-01-06  Adam Barth  <abarth at webkit.org>
    
            Reviewed by Eric Seidel.
    
            The EWS should log outside of the working directory
            https://bugs.webkit.org/show_bug.cgi?id=51986
    
            This patch prepare us for using git clean -x -d -f in the EWS wrapper
            script, which will actually clean the working copy back to a pristine
            state instead of leaving untracked directories and ignored files.
    
            * Scripts/webkitpy/tool/commands/queues.py:
            * Scripts/webkitpy/tool/commands/queues_unittest.py:
    
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@75149 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/Tools/ChangeLog b/Tools/ChangeLog
index e6dfe5d..2f66a23 100644
--- a/Tools/ChangeLog
+++ b/Tools/ChangeLog
@@ -1,3 +1,17 @@
+2011-01-06  Adam Barth  <abarth at webkit.org>
+
+        Reviewed by Eric Seidel.
+
+        The EWS should log outside of the working directory
+        https://bugs.webkit.org/show_bug.cgi?id=51986
+
+        This patch prepare us for using git clean -x -d -f in the EWS wrapper
+        script, which will actually clean the working copy back to a pristine
+        state instead of leaving untracked directories and ignored files.
+
+        * Scripts/webkitpy/tool/commands/queues.py:
+        * Scripts/webkitpy/tool/commands/queues_unittest.py:
+
 2011-01-05  Steve Falkenburg  <sfalken at apple.com>
 
         Windows build fix.
diff --git a/Tools/Scripts/webkitpy/tool/commands/queues.py b/Tools/Scripts/webkitpy/tool/commands/queues.py
index 7683c7f..5628543 100644
--- a/Tools/Scripts/webkitpy/tool/commands/queues.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queues.py
@@ -96,7 +96,7 @@ class AbstractQueue(Command, QueueEngineDelegate):
         return self._tool.executive.run_and_throw_if_fail(webkit_patch_args)
 
     def _log_directory(self):
-        return "%s-logs" % self.name
+        return os.path.join("..", "%s-logs" % self.name)
 
     # QueueEngineDelegate methods
 
diff --git a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
index f171075..34a6a64 100644
--- a/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
+++ b/Tools/Scripts/webkitpy/tool/commands/queues_unittest.py
@@ -55,7 +55,7 @@ class TestFeederQueue(FeederQueue):
 
 class AbstractQueueTest(CommandsTest):
     def test_log_directory(self):
-        self.assertEquals(TestQueue()._log_directory(), "test-queue-logs")
+        self.assertEquals(TestQueue()._log_directory(), os.path.join("..", "test-queue-logs"))
 
     def _assert_run_webkit_patch(self, run_args, port=None):
         queue = TestQueue()

-- 
WebKit Debian packaging