[SCM] WebKit Debian packaging branch, webkit-1.2, updated. upstream/1.1.90-6072-g9a69373

[dpranke at chromium.org]

The following commit has been merged in the webkit-1.2 branch:
commit edd433b35d5a45a3b97e03b2918ea9e09ceb35ea
Author: dpranke at chromium.org <dpranke at chromium.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Date:   Wed Feb 24 22:31:39 2010 +0000

    squash for checkin
    
    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@55202 268f45cc-cd09-0410-ab3c-d52691b4dbfc

diff --git a/WebKitTools/ChangeLog b/WebKitTools/ChangeLog
index 2491c10..75f970b 100644
--- a/WebKitTools/ChangeLog
+++ b/WebKitTools/ChangeLog
@@ -1,3 +1,17 @@
+2010-02-24  Dirk Pranke  <dpranke at chromium.org>
+
+        Reviewed by Eric Siedel.
+
+        Check the proper directory for a WebKit SVN version (Chromium does
+        not check out the entire WebKit tree directly, but rather pulls
+        individual subdirectories. So, checking for the SVN version in
+        WebKit/WebCore rather than just in WebKit works more reliably across
+        different ports).
+
+        http://bugs.webkit.org/show_bug.cgi?id=35321
+
+        * Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py:
+
 2010-02-24  Alexey Proskuryakov  <ap at apple.com>
 
         Reviewed by Dan Bernstein.
diff --git a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
index 84be0e1..9830f66 100644
--- a/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
+++ b/WebKitTools/Scripts/webkitpy/layout_tests/layout_package/json_results_generator.py
@@ -307,7 +307,7 @@ class JSONResultsGenerator(object):
         # These next two branches test to see which source repos we can
         # pull revisions from.
         if hasattr(self._port, 'path_from_webkit_base'):
-            path_to_webkit = self._port.path_from_webkit_base()
+            path_to_webkit = self._port.path_from_webkit_base('WebCore')
             self._insert_item_into_raw_list(results_for_builder,
                 self._get_svn_revision(path_to_webkit),
                 self.WEBKIT_SVN)

-- 
WebKit Debian packaging