Title: [265409] trunk/Tools
- Revision
- 265409
- Author
- [email protected]
- Date
- 2020-08-08 13:31:13 -0700 (Sat, 08 Aug 2020)
Log Message
[WinCairo] REGRESSION(r265408): Unreviewed layout test script fix
https://bugs.webkit.org/show_bug.cgi?id=215292
<rdar://problem/66698141>
os.getuid() is available only for Unix.
> AttributeError: 'module' object has no attribute 'getuid'
* Scripts/webkitpy/__init__.py: Don't use os.getuid() unless sys.platform == 'darwin'.
Modified Paths
Diff
Modified: trunk/Tools/ChangeLog (265408 => 265409)
--- trunk/Tools/ChangeLog 2020-08-08 13:43:54 UTC (rev 265408)
+++ trunk/Tools/ChangeLog 2020-08-08 20:31:13 UTC (rev 265409)
@@ -1,3 +1,15 @@
+2020-08-08 Fujii Hironori <[email protected]>
+
+ [WinCairo] REGRESSION(r265408): Unreviewed layout test script fix
+ https://bugs.webkit.org/show_bug.cgi?id=215292
+ <rdar://problem/66698141>
+
+ os.getuid() is available only for Unix.
+
+ > AttributeError: 'module' object has no attribute 'getuid'
+
+ * Scripts/webkitpy/__init__.py: Don't use os.getuid() unless sys.platform == 'darwin'.
+
2020-08-08 Jonathan Bedard <[email protected]>
[webkitpy] Pick a reasonable auto-install location on NFS mounts
Modified: trunk/Tools/Scripts/webkitpy/__init__.py (265408 => 265409)
--- trunk/Tools/Scripts/webkitpy/__init__.py 2020-08-08 13:43:54 UTC (rev 265408)
+++ trunk/Tools/Scripts/webkitpy/__init__.py 2020-08-08 20:31:13 UTC (rev 265409)
@@ -18,10 +18,11 @@
libraries = os.path.join(os.path.abspath(os.path.dirname(os.path.dirname(__file__))), 'libraries')
sys.path.insert(0, os.path.join(libraries, 'webkitcorepy'))
-is_root = not os.getuid()
-does_own_libraries = os.stat(libraries).st_uid == os.getuid()
-if sys.platform == 'darwin' and (is_root or not does_own_libraries):
- libraries = os.path.expanduser('~/Library/webkitpy')
+if sys.platform == 'darwin':
+ is_root = not os.getuid()
+ does_own_libraries = os.stat(libraries).st_uid == os.getuid()
+ if (is_root or not does_own_libraries):
+ libraries = os.path.expanduser('~/Library/webkitpy')
from webkitcorepy import AutoInstall
AutoInstall.set_directory(os.path.join(libraries, 'autoinstalled', 'python-{}'.format(sys.version_info[0])))
_______________________________________________
webkit-changes mailing list
[email protected]
https://lists.webkit.org/mailman/listinfo/webkit-changes
