[jhbuild] wrong Dependencies path
authorphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Dec 2014 10:36:47 +0000 (10:36 +0000)
committerphiln@webkit.org <philn@webkit.org@268f45cc-cd09-0410-ab3c-d52691b4dbfc>
Tue, 2 Dec 2014 10:36:47 +0000 (10:36 +0000)
https://bugs.webkit.org/show_bug.cgi?id=139176

Reviewed by Martin Robinson.

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

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

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

index 6532c90..5d3357f 100644 (file)
@@ -1,5 +1,15 @@
 2014-12-02  Philippe Normand  <pnormand@igalia.com>
 
+        [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  <pnormand@igalia.com>
+
         [GStreamer] Bump internal jhbuild versions to 1.4.4
         https://bugs.webkit.org/show_bug.cgi?id=138866
 
index 3d0d4eb..9d47fee 100644 (file)
@@ -1267,7 +1267,10 @@ class Port(object):
         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).