Changeset 91033 in webkit

Timestamp:

Jul 14, 2011 4:23:09 PM (13 years ago)

Author:

rniwa@webkit.org

Message:

REGRESSION: webkit-patch roll-chromium-deps is broken
​https://bugs.webkit.org/show_bug.cgi?id=64568

Reviewed by Dirk Pranke

Use _filesystem.join.

• Scripts/webkitpy/common/checkout/checkout.py:
• Scripts/webkitpy/common/checkout/checkout_unittests.py:

Location:

trunk/Tools

Files:

• ChangeLog (modified) (1 diff)
• Scripts/webkitpy/common/checkout/checkout.py (modified) (1 diff)
• Scripts/webkitpy/common/checkout/checkout_unittest.py (modified) (1 diff)

trunk/Tools/ChangeLog

@@ +1 @@
+2011-07-14  Ryosuke Niwa  <rniwa@webkit.org>
+
+        REGRESSION: webkit-patch roll-chromium-deps is broken
+        https://bugs.webkit.org/show_bug.cgi?id=64568
+
+        Reviewed by Dirk Pranke
+
+        Use _filesystem.join.
+
+        * Scripts/webkitpy/common/checkout/checkout.py:
+        * Scripts/webkitpy/common/checkout/checkout_unittests.py:
+
 2011-07-14  Noam Rosenthal  <noam.rosenthal@nokia.com>
 

trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py

@@ -149 +149 @@
 
     def chromium_deps(self):
-        return DEPS(self._scm.absolute_path("Source", "WebKit", "chromium", "DEPS"))
+        return DEPS(self._scm.absolute_path(self._filesystem.join("Source", "WebKit", "chromium", "DEPS")))
 
     def apply_patch(self, patch, force=False):

trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py

@@ -244 +244 @@
         reviewer_names = [reviewer.full_name for reviewer in reviewers]
         self.assertEqual(reviewer_names, [u'Tor Arne Vestb\xf8'])
+
+    def test_chromium_deps(self):
+        checkout = self._make_checkout()
+        checkout._scm.checkout_root = "/foo/bar"
+        self.assertEqual(checkout.chromium_deps()._path, '/foo/bar/Source/WebKit/chromium/DEPS')