Changeset 47b1787 in trunk

Timestamp:

2018-04-30T20:55:51Z (7 years ago)

Author:

meejah <meejah@…>

Branches:

master

Children:

affb80e

Parents:

e000047

git-author:

meejah <meejah@…> (2018-03-21 18:15:11)

git-committer:

meejah <meejah@…> (2018-04-30 20:55:51)

Message:

stop writing .backup files for normal overwrites

Location:

src/allmydata

Files:

• frontends/magic_folder.py (modified) (2 diffs)
• util/fileutil.py (modified) (2 diffs)

src/allmydata/frontends/magic_folder.py ¶

@@ -991 +991 @@
         precondition_abspath(abspath_u)
         replacement_path_u = abspath_u + u".tmp"  # FIXME more unique
-        backup_path_u = abspath_u + u".backup"
         if now is None:
             now = time.time()
@@ -1012 +1011 @@
         else:
             try:
-                # XXX this is wrong; I think we're right now *always*
-                # creating a .backup file if we a) downloaded
-                # something and b) we already had a file.
-                # so if you have alice + bob and file0:
-                # - alice adds file0
-                # - bob downloads file0
-                # - alice changes file0
-                # - bob downloads file0 (and creates file0.backup)
-                # - alice changes file0
-                # - bob downloads file0 (tries to create file0.backup, then makes file0.conflict)
-
-                fileutil.replace_file(abspath_u, replacement_path_u, backup_path_u)
+                fileutil.replace_file(abspath_u, replacement_path_u)
                 return abspath_u
             except fileutil.ConflictError:

src/allmydata/util/fileutil.py ¶

@@ -614 +614 @@
         os.rename(source_path, dest_path)
 
-    def replace_file(replaced_path, replacement_path, backup_path):
+    def replace_file(replaced_path, replacement_path):
         precondition_abspath(replaced_path)
         precondition_abspath(replacement_path)
-        precondition_abspath(backup_path)
-
-        r = ReplaceFileW(replaced_path, replacement_path, backup_path,
+
+        # no "backup" path (the first None) because we don't want to
+        # create a backup file
+        r = ReplaceFileW(replaced_path, replacement_path, None,
                          REPLACEFILE_IGNORE_MERGE_ERRORS, None, None)
         if r == 0:
@@ -641 +642 @@
             reraise(UnableToUnlinkReplacementError)
 
-    def replace_file(replaced_path, replacement_path, backup_path):
+    def replace_file(replaced_path, replacement_path):
         precondition_abspath(replaced_path)
         precondition_abspath(replacement_path)
-        precondition_abspath(backup_path)
 
         if not os.path.exists(replacement_path):
             raise ConflictError("Replacement file not found: %r" % (replacement_path,))
 
-        try:
-            os.rename(replaced_path, backup_path)
-        except OSError as e:
-            if e.errno != ENOENT:
-                raise
         try:
             rename_no_overwrite(replacement_path, replaced_path)