ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-24 07:06:41 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix conflict logging

Browse Source
This commit is contained in:
Jean-Paul Calderone 2019-02-26 14:38:24 -05:00
parent 3fca501d45
commit ebeeba456f
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -834,6 +834,7 @@ _CONFLICT_REASON = Field.for_types(
u"dbentry newer version",
u"last_downloaded_uri mismatch",
u"file appeared",
None,
}),
)
@ -1894,6 +1895,7 @@ class Downloader(QueueMixin, WriteFileMixin):
# uploaded.
with CHECKING_CONFLICTS() as action:
conflict_reason = None
if db_entry:
# * 2c. If any of the following are true, then classify as a conflict:
# * i. there are pending notifications of changes to ``foo``;
@ -1902,7 +1904,6 @@ class Downloader(QueueMixin, WriteFileMixin):
# current statinfo;
if current_statinfo.exists:
conflict_reason = None
if (db_entry.mtime_ns != current_statinfo.mtime_ns or \
db_entry.ctime_ns != current_statinfo.ctime_ns or \
db_entry.size != current_statinfo.size):