mirrors/cpython
1
0
Fork 0
mirror of https://github.com/python/cpython.git synced 2025-11-25 04:34:37 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 11

Issue #28764: Fix a test_mailbox failure on Android API 24 when run as a non-root user.

Browse source
This commit is contained in:
Xavier de Gaye 2016-12-12 09:55:57 +01:00
parent b227227cb5
commit 452b3a6a3e
2 changed files with 14 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

21
Lib/mailbox.py
View file

@ -313,11 +313,12 @@ class Maildir(Mailbox):
# final position in order to prevent race conditions with changes
# from other programs
try:
if hasattr(os, 'link'):
try:
os.link(tmp_file.name, dest)
os.remove(tmp_file.name)
else:
except (AttributeError, PermissionError):
os.rename(tmp_file.name, dest)
else:
os.remove(tmp_file.name)
except OSError as e:
os.remove(tmp_file.name)
if e.errno == errno.EEXIST:
@ -1200,13 +1201,14 @@ class MH(Mailbox):
for key in self.iterkeys():
if key - 1 != prev:
changes.append((key, prev + 1))
if hasattr(os, 'link'):
try:
os.link(os.path.join(self._path, str(key)),
os.path.join(self._path, str(prev + 1)))
os.unlink(os.path.join(self._path, str(key)))
else:
except (AttributeError, PermissionError):
os.rename(os.path.join(self._path, str(key)),
os.path.join(self._path, str(prev + 1)))
else:
os.unlink(os.path.join(self._path, str(key)))
prev += 1
self._next_key = prev + 1
if len(changes) == 0:
@ -2076,13 +2078,14 @@ def _lock_file(f, dotlock=True):
else:
raise
try:
if hasattr(os, 'link'):
try:
os.link(pre_lock.name, f.name + '.lock')
dotlock_done = True
os.unlink(pre_lock.name)
else:
except (AttributeError, PermissionError):
os.rename(pre_lock.name, f.name + '.lock')
dotlock_done = True
else:
os.unlink(pre_lock.name)
except FileExistsError:
os.remove(pre_lock.name)
raise ExternalClashError('dot lock unavailable: %s' %