Title: [158049] branches/safari-537-branch/Tools
Diff
Modified: branches/safari-537-branch/Tools/ChangeLog (158048 => 158049)
--- branches/safari-537-branch/Tools/ChangeLog 2013-10-25 20:40:36 UTC (rev 158048)
+++ branches/safari-537-branch/Tools/ChangeLog 2013-10-25 20:41:32 UTC (rev 158049)
@@ -1,5 +1,16 @@
2013-10-25 Lucas Forschler <[email protected]>
+ Merge r157995
+
+ 2013-10-25 Ryosuke Niwa <[email protected]>
+
+ Build fix after r157815. Don't resolve the path from webkit_base. Use the relative path as is.
+
+ * Scripts/webkitpy/port/base.py:
+ (Port.repository_paths):
+
+2013-10-25 Lucas Forschler <[email protected]>
+
Merge r157815
2013-10-22 Ryosuke Niwa <[email protected]>
Modified: branches/safari-537-branch/Tools/Scripts/webkitpy/port/base.py (158048 => 158049)
--- branches/safari-537-branch/Tools/Scripts/webkitpy/port/base.py 2013-10-25 20:40:36 UTC (rev 158048)
+++ branches/safari-537-branch/Tools/Scripts/webkitpy/port/base.py 2013-10-25 20:41:32 UTC (rev 158049)
@@ -1090,7 +1090,7 @@
# where turnk isn't checked out as a whole.
repository_paths = [('WebKit', self.layout_tests_dir())]
if self.get_option('additional_repository_name') and self.get_option('additional_repository_path'):
- repository_paths += [(self._options.additional_repository_name, self.path_from_webkit_base(self._options.additional_repository_path))]
+ repository_paths += [(self._options.additional_repository_name, self._options.additional_repository_path)]
return repository_paths
_WDIFF_DEL = '##WDIFF_DEL##'
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
