Imported WebKit commit 7e538425aa020340619e927792f3d895061fb54b (http://svn.webkit.org/repository/webkit/trunk@116286)

1 files changed, 8 insertions, 8 deletions

diff --git a/Tools/Scripts/webkitpy/common/system/file_lock.py b/Tools/Scripts/webkitpy/common/system/file_lock.py
index b4bfffc40..c542777f2 100644
--- a/Tools/Scripts/webkitpy/common/system/file_lock.py
+++ b/Tools/Scripts/webkitpy/common/system/file_lock.py
@@ -43,20 +43,20 @@ class FileLock(object):
         self._max_wait_time_sec = max_wait_time_sec
 
     def _create_lock(self):
-        if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
-            import fcntl
-            fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_EX | fcntl.LOCK_NB)
-        elif sys.platform == 'win32':
+        if sys.platform == 'win32':
             import msvcrt
             msvcrt.locking(self._lock_file_descriptor, msvcrt.LK_NBLCK, 32)
+        else:
+            import fcntl
+            fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_EX | fcntl.LOCK_NB)
 
     def _remove_lock(self):
-        if sys.platform.startswith('linux') or sys.platform in ('darwin', 'cygwin'):
-            import fcntl
-            fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_UN)
-        elif sys.platform == 'win32':
+        if sys.platform == 'win32':
             import msvcrt
             msvcrt.locking(self._lock_file_descriptor, msvcrt.LK_UNLCK, 32)
+        else:
+            import fcntl
+            fcntl.flock(self._lock_file_descriptor, fcntl.LOCK_UN)
 
     def acquire_lock(self):
         self._lock_file_descriptor = os.open(self._lock_file_path, os.O_TRUNC | os.O_CREAT)