From fce5b789dcb1b556ce57e8cc8ec4408d46663669 Mon Sep 17 00:00:00 2001 From: meejah Date: Tue, 10 May 2016 14:06:48 -0700 Subject: [PATCH] fixup rebase conflict mis-resolutions --- src/allmydata/frontends/magic_folder.py | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py index 336e2cbe6..47bbc5af1 100644 --- a/src/allmydata/frontends/magic_folder.py +++ b/src/allmydata/frontends/magic_folder.py @@ -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):