this shouldn't have gotten removed

src/allmydata/frontends/magic_folder.py

@@ -1390,8 +1390,6 @@ class Downloader(QueueMixin, WriteFileMixin):
             #     uploaded.
 
             if db_entry:
-                dmd_last_uploaded_uri = item.metadata.get('last_uploaded_uri', None)
-
                 # * 2c. If any of the following are true, then classify as a conflict:
                 #   * i. there are pending notifications of changes to ``foo``;
                 #   * ii. the last-seen statinfo is either absent (i.e. there is

src/allmydata/util/fileutil.py

@@ -652,6 +652,10 @@ else:
             move_into_place(replacement_path, replaced_path)
         except EnvironmentError:
             reraise(ConflictError)
+        except OSError as e:
+            if e.errno != ENOENT:
+                raise
+
 
 PathInfo = namedtuple('PathInfo', 'isdir isfile islink exists size mtime_ns ctime_ns')