Title: [235319] branches/safari-606-branch/Tools
Revision
235319
Author
ryanhad...@apple.com
Date
2018-08-24 08:56:14 -0700 (Fri, 24 Aug 2018)

Log Message

Cherry-pick r235317. rdar://problem/43646060

    Fix handling of iOS minor versions in default_baseline_search_path
    https://bugs.webkit.org/show_bug.cgi?id=188902

    Reviewed by Aakash Jain.

    * Scripts/webkitpy/port/ios.py:
    (IOSPort.default_baseline_search_path): When the major version matches the major version of the CURRENT_VERSION, treat
    it as a the CURRENT_VERSION.

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

Modified Paths

Diff

Modified: branches/safari-606-branch/Tools/ChangeLog (235318 => 235319)


--- branches/safari-606-branch/Tools/ChangeLog	2018-08-24 15:20:48 UTC (rev 235318)
+++ branches/safari-606-branch/Tools/ChangeLog	2018-08-24 15:56:14 UTC (rev 235319)
@@ -1,3 +1,30 @@
+2018-08-24  Ryan Haddad  <ryanhad...@apple.com>
+
+        Cherry-pick r235317. rdar://problem/43646060
+
+    Fix handling of iOS minor versions in default_baseline_search_path
+    https://bugs.webkit.org/show_bug.cgi?id=188902
+    
+    Reviewed by Aakash Jain.
+    
+    * Scripts/webkitpy/port/ios.py:
+    (IOSPort.default_baseline_search_path): When the major version matches the major version of the CURRENT_VERSION, treat
+    it as a the CURRENT_VERSION.
+    
+    
+    git-svn-id: http://svn.webkit.org/repository/webkit/trunk@235317 268f45cc-cd09-0410-ab3c-d52691b4dbfc
+
+    2018-08-24  Jonathan Bedard  <jbed...@apple.com>
+
+            Fix handling of iOS minor versions in default_baseline_search_path
+            https://bugs.webkit.org/show_bug.cgi?id=188902
+
+            Reviewed by Aakash Jain.
+
+            * Scripts/webkitpy/port/ios.py:
+            (IOSPort.default_baseline_search_path): When the major version matches the major version of the CURRENT_VERSION, treat
+            it as a the CURRENT_VERSION.
+
 2018-08-10  Ryan Haddad  <ryanhad...@apple.com>
 
         Cherry-pick r234734. rdar://problem/42387347

Modified: branches/safari-606-branch/Tools/Scripts/webkitpy/port/ios.py (235318 => 235319)


--- branches/safari-606-branch/Tools/Scripts/webkitpy/port/ios.py	2018-08-24 15:20:48 UTC (rev 235318)
+++ branches/safari-606-branch/Tools/Scripts/webkitpy/port/ios.py	2018-08-24 15:56:14 UTC (rev 235319)
@@ -96,7 +96,7 @@
             wk_string = 'wk2'
 
         versions_to_fallback = []
-        if self.ios_version() == self.CURRENT_VERSION:
+        if self.ios_version().major == self.CURRENT_VERSION.major:
             versions_to_fallback = [self.CURRENT_VERSION]
         elif self.ios_version():
             temp_version = Version(self.ios_version().major)
_______________________________________________
webkit-changes mailing list
webkit-changes@lists.webkit.org
https://lists.webkit.org/mailman/listinfo/webkit-changes

Reply via email to