ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-01-31 16:36:20 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

this shouldn't have gotten removed

Browse Source
This commit is contained in:
meejah 2018-04-20 18:46:49 -06:00
parent a146afcf84
commit 99c3d7f23f
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/allmydata/frontends/magic_folder.py
View File

@ -1390,8 +1390,6 @@ class Downloader(QueueMixin, WriteFileMixin):
# uploaded. # uploaded.
if db_entry: if db_entry:
dmd_last_uploaded_uri = item.metadata.get('last_uploaded_uri', None)
# * 2c. If any of the following are true, then classify as a conflict: # * 2c. If any of the following are true, then classify as a conflict:
# * i. there are pending notifications of changes to ``foo``; # * i. there are pending notifications of changes to ``foo``;
# * ii. the last-seen statinfo is either absent (i.e. there is # * ii. the last-seen statinfo is either absent (i.e. there is

4
src/allmydata/util/fileutil.py
View File

@ -652,6 +652,10 @@ else:
move_into_place(replacement_path, replaced_path) move_into_place(replacement_path, replaced_path)
except EnvironmentError: except EnvironmentError:
reraise(ConflictError) reraise(ConflictError)
except OSError as e:
if e.errno != ENOENT:
raise
PathInfo = namedtuple('PathInfo', 'isdir isfile islink exists size mtime_ns ctime_ns') PathInfo = namedtuple('PathInfo', 'isdir isfile islink exists size mtime_ns ctime_ns')