Build fix after r157815. Don't resolve the path from webkit_base. Use the relative...
authorrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Oct 2013 08:32:50 +0000 (08:32 +0000)
committerrniwa@webkit.org <rniwa@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Fri, 25 Oct 2013 08:32:50 +0000 (08:32 +0000)
* Scripts/webkitpy/port/base.py:
(Port.repository_paths):

git-svn-id: https://svn.webkit.org/repository/webkit/trunk@157995 268f45cc-cd09-0410-ab3c-d52691b4dbfc

Tools/ChangeLog
Tools/Scripts/webkitpy/port/base.py

index 662aa43..6fb0ffb 100644 (file)
@@ -1,3 +1,10 @@
+2013-10-25  Ryosuke Niwa  <rniwa@webkit.org>
+
+        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  Jer Noble  <jer.noble@apple.com>
 
         [WTF] Add a multiplication operator (and a few others) to MediaTime
index 821df7d..e510629 100644 (file)
@@ -1092,7 +1092,7 @@ class Port(object):
         # 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##'