From: David Stainton <dstainton415@gmail.com>
Date: Wed, 15 Apr 2015 18:10:01 +0000 (+0000)
Subject: Fix pending upload bug
X-Git-Url: https://git.rkrishnan.org/simplejson/components/htmlfontify-example.html?a=commitdiff_plain;h=f9c773e54a8d064770ca2261511a830d01f04d76;p=tahoe-lafs%2Ftahoe-lafs.git

Fix pending upload bug

- remove filepath from pending upload set BEFORE performing upload
This bug was introduced at commit 87657eb382da05039cce99862691efcc27243193
---

diff --git a/src/allmydata/frontends/drop_upload.py b/src/allmydata/frontends/drop_upload.py
index ff8c3c7e..0dfe42b7 100644
--- a/src/allmydata/frontends/drop_upload.py
+++ b/src/allmydata/frontends/drop_upload.py
@@ -119,8 +119,8 @@ class DropUploader(service.MultiService):
             if sys.platform != "win32":
                 name = name.decode(get_filesystem_encoding())
 
-            u = FileName(path.path, self._convergence)
             self._pending.remove(path)
+            u = FileName(path.path, self._convergence)
             return self._parent.add_file(name, u)
         d.addCallback(_add_file)