ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-06-18 23:38:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

misc mutable-type fixes:

Browse Source 
* fix tahoe.cfg control of default mutable type
* tolerate arbitrary case in [client]mutable.format value
* small docs improvements
* use get_mutable_type() as a format-is-mutable predicate
* tighten up error message
This commit is contained in:
Brian Warner
2011-10-13 09:32:29 -07:00
parent 01b00dc7dc
commit 210761cd49
9 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/allmydata/client.py
View File

@ -339,19 +339,20 @@ class Client(node.Node, pollmixin.PollMixin):
self.blacklist = Blacklist(fn)
def init_nodemaker(self):
default = self.get_config("client", "mutable.format", default="SDMF")
if default.upper() == "MDMF":
self.mutable_file_default = MDMF_VERSION
else:
self.mutable_file_default = SDMF_VERSION
self.nodemaker = NodeMaker(self.storage_broker,
self._secret_holder,
self.get_history(),
self.getServiceNamed("uploader"),
self.terminator,
self.get_encoding_parameters(),
self.mutable_file_default,
self._key_generator,
self.blacklist)
default = self.get_config("client", "mutable.format", default="sdmf")
if default == "mdmf":
self.mutable_file_default = MDMF_VERSION
else:
self.mutable_file_default = SDMF_VERSION
def get_history(self):
return self.history
@ -507,8 +508,6 @@ class Client(node.Node, pollmixin.PollMixin):
return self.nodemaker.create_immutable_directory(children, convergence)
def create_mutable_file(self, contents=None, keysize=None, version=None):
if not version:
version = self.mutable_file_default
return self.nodemaker.create_mutable_file(contents, keysize,
version=version)