From: David Stainton <dstainton415@gmail.com>
Date: Fri, 17 Apr 2015 21:25:30 +0000 (+0100)
Subject: Remove filepath from pending set earlier
X-Git-Url: https://git.rkrishnan.org/index.php?a=commitdiff_plain;h=bacc6ce4d524bf484a90919b8587f5f4ab2a928d;p=tahoe-lafs%2Ftahoe-lafs.git

Remove filepath from pending set earlier
---

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index 47ab0301..57ff6705 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -158,12 +158,11 @@ class DropUploader(service.MultiService):
         # FIXME (ticket #1712): if this already exists as a mutable file, we replace the
         # directory entry, but we should probably modify the file (as the SFTP frontend does).
         def _add_file(ign):
+            self._pending.remove(path)
             name = path.basename()
             # on Windows the name is already Unicode
             if sys.platform != "win32":
                 name = name.decode(get_filesystem_encoding())
-
-            self._pending.remove(path)
             u = FileName(path.path, self._convergence)
             return self._parent.add_file(name, u)
         d.addCallback(_add_file)