From: robk-tahoe <robk-tahoe@allmydata.com>
Date: Fri, 18 Jan 2008 00:36:28 +0000 (-0700)
Subject: UNDO: offloaded: close reader before removing its file
X-Git-Tag: allmydata-tahoe-0.8.0~280
X-Git-Url: https://git.rkrishnan.org/simplejson/frontends?a=commitdiff_plain;h=7b990cc9afb4c6b86b33755b355a3184283aed3b;p=tahoe-lafs%2Ftahoe-lafs.git

UNDO: offloaded: close reader before removing its file

unlinking a file before closing it is not portable. it works on unix, but fails
since an open file holds a lock on windows.

this closes the reader before trying to unlink the encoding file within the
CHKUploadHelper.
---

diff --git a/src/allmydata/offloaded.py b/src/allmydata/offloaded.py
index 66b7fbc7..9f1966c1 100644
--- a/src/allmydata/offloaded.py
+++ b/src/allmydata/offloaded.py
@@ -92,7 +92,6 @@ class CHKUploadHelper(Referenceable, upload.CHKUploader):
     def _finished(self, res):
         (uri_extension_hash, needed_shares, total_shares, size) = res
         upload_results = {'uri_extension_hash': uri_extension_hash}
-        self._reader.close()
         os.unlink(self._encoding_file)
         self._finished_observers.fire(upload_results)
         self._helper.upload_finished(self._storage_index)