Bug fix: delete empty blobs

When creating a CryptStream, the last blob is always empty. Previously, this
blob wouldn't be deleted and would instead just stick around in the blobfiles
directory.
This commit is contained in:
Job Evers-Meltzer 2017-01-21 17:27:19 -06:00
parent dc57b62157
commit c211d87164

View file

@ -392,16 +392,11 @@ class BlobFileCreator(HashBlobCreator):
def _close(self): def _close(self):
temp_file_name = self.out_file.name temp_file_name = self.out_file.name
self.out_file.close() self.out_file.close()
def change_file_name():
shutil.move(temp_file_name, os.path.join(self.blob_dir, self.blob_hash))
return True
if self.blob_hash is not None: if self.blob_hash is not None:
d = threads.deferToThread(change_file_name) shutil.move(temp_file_name, os.path.join(self.blob_dir, self.blob_hash))
else: else:
d = defer.succeed(True) os.remove(temp_file_name)
return d return defer.succeed(True)
def _write(self, data): def _write(self, data):
self.out_file.write(data) self.out_file.write(data)