ExternalVendorCode/tahoe-lafs
1
0
Fork 0
mirror of https://github.com/tahoe-lafs/tahoe-lafs.git synced 2025-02-08 04:10:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

different way to say 'all items okay'

Browse Source
This commit is contained in:
meejah 2023-02-28 10:43:49 -07:00
parent aed5061a96
commit b28ac6118b
2 changed files with 3 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/allmydata/client.py
View File

@ -76,7 +76,8 @@ def _is_valid_section(section_name):
""" """
return ( return (
section_name.startswith("storageserver.plugins.") or section_name.startswith("storageserver.plugins.") or
section_name.startswith("storageclient.plugins.") section_name.startswith("storageclient.plugins.") or
section_name in ("grid_managers", "grid_manager_certificates")
) )
@ -93,8 +94,6 @@ _client_config = configutil.ValidConfiguration(
"shares.total", "shares.total",
"storage.plugins", "storage.plugins",
), ),
"grid_managers": None, # means "any options valid"
"grid_manager_certificates": None,
"storage": ( "storage": (
"debug_discard", "debug_discard",
"enabled", "enabled",

5
src/allmydata/util/configutil.py
View File

@ -170,11 +170,8 @@ class ValidConfiguration(object):
:return: True if the given section name, item_name pair is valid, False :return: True if the given section name, item_name pair is valid, False
otherwise. otherwise.
""" """
valid_items = self._static_valid_sections.get(section_name, ())
if valid_items is None:
return True
return ( return (
item_name in valid_items or item_name in self._static_valid_sections.get(section_name, ()) or
self._is_valid_item(section_name, item_name) self._is_valid_item(section_name, item_name)
) )