Title: [91033] trunk/Tools
- Revision
- 91033
- Author
- [email protected]
- Date
- 2011-07-14 16:23:09 -0700 (Thu, 14 Jul 2011)
Log 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:
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (91032 => 91033)
--- trunk/Tools/ChangeLog 2011-07-14 23:22:21 UTC (rev 91032)
+++ trunk/Tools/ChangeLog 2011-07-14 23:23:09 UTC (rev 91033)
@@ -1,3 +1,15 @@
+2011-07-14 Ryosuke Niwa <[email protected]>
+
+ 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 <[email protected]>
Adding myself to the reviewers list; No review needed.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py (91032 => 91033)
--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py 2011-07-14 23:22:21 UTC (rev 91032)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout.py 2011-07-14 23:23:09 UTC (rev 91033)
@@ -148,7 +148,7 @@
pass # We might not have ChangeLogs.
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):
# It's possible that the patch was not made from the root directory.
Modified: trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py (91032 => 91033)
--- trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2011-07-14 23:22:21 UTC (rev 91032)
+++ trunk/Tools/Scripts/webkitpy/common/checkout/checkout_unittest.py 2011-07-14 23:23:09 UTC (rev 91033)
@@ -243,3 +243,8 @@
reviewers = checkout.suggested_reviewers(git_commit=None)
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')
_______________________________________________
webkit-changes mailing list
[email protected]
http://lists.webkit.org/mailman/listinfo.cgi/webkit-changes
