[utils] Fix file locking for AOSP (#2714)
Closes #2080, #2670 Authored by: jakeogh
This commit is contained in:
parent
f1d130902b
commit
acea8d7cfb
1 changed files with 16 additions and 6 deletions
|
@ -2141,18 +2141,28 @@ if sys.platform == 'win32':
|
|||
raise OSError('Unlocking file failed: %r' % ctypes.FormatError())
|
||||
|
||||
else:
|
||||
# Some platforms, such as Jython, is missing fcntl
|
||||
try:
|
||||
import fcntl
|
||||
|
||||
def _lock_file(f, exclusive, block):
|
||||
fcntl.flock(f,
|
||||
fcntl.LOCK_SH if not exclusive
|
||||
else fcntl.LOCK_EX if block
|
||||
else fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
try:
|
||||
fcntl.flock(f,
|
||||
fcntl.LOCK_SH if not exclusive
|
||||
else fcntl.LOCK_EX if block
|
||||
else fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
except BlockingIOError:
|
||||
raise
|
||||
except OSError: # AOSP does not have flock()
|
||||
fcntl.lockf(f,
|
||||
fcntl.LOCK_SH if not exclusive
|
||||
else fcntl.LOCK_EX if block
|
||||
else fcntl.LOCK_EX | fcntl.LOCK_NB)
|
||||
|
||||
def _unlock_file(f):
|
||||
fcntl.flock(f, fcntl.LOCK_UN)
|
||||
try:
|
||||
fcntl.flock(f, fcntl.LOCK_UN)
|
||||
except OSError:
|
||||
fcntl.lockf(f, fcntl.LOCK_UN)
|
||||
|
||||
except ImportError:
|
||||
UNSUPPORTED_MSG = 'file locking is not supported on this platform'
|
||||
|
|
Loading…
Reference in a new issue