ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2024-12-19 21:17:54 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

fixup rebase conflict mis-resolutions

Browse Source
This commit is contained in:
meejah 2016-05-10 14:06:48 -07:00 committed by Brian Warner
parent ba9abe6a2b
commit fce5b789dc
1 changed files with 2 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -54,13 +54,8 @@ def is_new_file(pathinfo, db_entry):
print("is_new_file: False because", pathinfo.exists, db_entry.size)
return False
result = ((pathinfo.size, pathinfo.ctime_ns, pathinfo.mtime_ns) !=
(db_entry.size, db_entry.ctime_ns, db_entry.mtime_ns))
print("is_new_file:", result, "because",
pathinfo.size, pathinfo.ctime_ns, pathinfo.mtime_ns,
db_entry.size, db_entry.ctime_ns, db_entry.mtime_ns)
return result
return ((pathinfo.size, pathinfo.ctime_ns, pathinfo.mtime_ns) !=
(db_entry.size, db_entry.ctime_ns, db_entry.mtime_ns))
class MagicFolder(service.MultiService):