Title: [176629] trunk/Tools
Revision
176629
Author
[email protected]
Date
2014-12-02 02:36:47 -0800 (Tue, 02 Dec 2014)

Log Message

[jhbuild] wrong Dependencies path
https://bugs.webkit.org/show_bug.cgi?id=139176

Reviewed by Martin Robinson.

* Scripts/webkitpy/port/base.py:
(Port._should_use_jhbuild):

Modified Paths

Diff

Modified: trunk/Tools/ChangeLog (176628 => 176629)


--- trunk/Tools/ChangeLog	2014-12-02 09:47:19 UTC (rev 176628)
+++ trunk/Tools/ChangeLog	2014-12-02 10:36:47 UTC (rev 176629)
@@ -1,5 +1,15 @@
 2014-12-02  Philippe Normand  <[email protected]>
 
+        [jhbuild] wrong Dependencies path
+        https://bugs.webkit.org/show_bug.cgi?id=139176
+
+        Reviewed by Martin Robinson.
+
+        * Scripts/webkitpy/port/base.py:
+        (Port._should_use_jhbuild):
+
+2014-12-02  Philippe Normand  <[email protected]>
+
         [GStreamer] Bump internal jhbuild versions to 1.4.4
         https://bugs.webkit.org/show_bug.cgi?id=138866
 

Modified: trunk/Tools/Scripts/webkitpy/port/base.py (176628 => 176629)


--- trunk/Tools/Scripts/webkitpy/port/base.py	2014-12-02 09:47:19 UTC (rev 176628)
+++ trunk/Tools/Scripts/webkitpy/port/base.py	2014-12-02 10:36:47 UTC (rev 176629)
@@ -1267,7 +1267,10 @@
         return True
 
     def _should_use_jhbuild(self):
-        return os.path.exists(self.path_from_webkit_base('WebKitBuild', 'Dependencies'))
+        suffix = ""
+        if self.port_name:
+            suffix = self.port_name.upper()
+        return os.path.exists(self.path_from_webkit_base('WebKitBuild', 'Dependencies%s' % suffix))
 
     # FIXME: Eventually we should standarize port naming, and make this method smart enough
     # to use for all port configurations (including architectures, graphics types, etc).
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to