From: David Stainton <dstainton415@gmail.com>
Date: Wed, 26 Aug 2015 15:50:03 +0000 (+0200)
Subject: Add err print statement to show the conflict...
X-Git-Url: https://git.rkrishnan.org/?a=commitdiff_plain;h=ce0b0d87b56c2f8917e2084522ce399310060b81;p=tahoe-lafs%2Ftahoe-lafs.git

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 bee6fc71..5ff69514 100644
--- 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 9a194e99..5461319d 100644
--- 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)