Add err print statement to show the conflict...

diff --git a/src/allmydata/frontends/magic_folder.py b/src/allmydata/frontends/magic_folder.py
index bee6fc715aa34b0d07331b95cb04d8d802438c25..5ff6951492d34032a84712887189d23ea425ee7a 100644 (file)
--- a/src/allmydata/frontends/magic_folder.py
+++ b/src/allmydata/frontends/magic_folder.py
@@ -573,7 +573,9 @@ class Downloader(QueueMixin):
             cls._rename_conflicted_file(path, replacement_path)
         else:
             try:
+                print "-------- here's the conflict replace_file: path %s, replacement_path %s, backup_path %s" % (path, replacement_path, backup_path)
                 fileutil.replace_file(path, replacement_path, backup_path)
+
             except fileutil.ConflictError:
                 is_conflict = True
                 cls._rename_conflicted_file(path, replacement_path)

diff --git a/src/allmydata/util/fileutil.py b/src/allmydata/util/fileutil.py
index 9a194e99df0df52e3f4b82e865edec5421a6b88b..5461319db9fd2b4e318a75eb1cb076da5a1ac835 100644 (file)
--- a/src/allmydata/util/fileutil.py
+++ b/src/allmydata/util/fileutil.py
@@ -622,6 +622,7 @@ else:
             os.rename(replaced_path, backup_path)
             rename_no_overwrite(replacement_path, replaced_path)
         except EnvironmentError:
+            print "@@@@@@@@@@@@@@@@@@@@@@@@@@@env err"
             reraise(ConflictError)