upstream/bind9
1
0
Fork 0
mirror of https://github.com/isc-projects/bind9.git synced 2026-05-27 03:46:03 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

[9.18] fix: dev: Preserve statement tag order in documentation

Browse source 
This supports bit-for-bit reproducibility of built documentation.

Closes #4886

Backport of MR !9399

Merge branch 'backport-issue-4886/order-preserving-documentation-tags-9.18' into 'bind-9.18'

See merge request isc-projects/bind9!9409
This commit is contained in:
Petr Špaček 2024-08-23 14:42:41 +00:00
commit b4d1988c28
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
doc/arm/_ext/iscconf.py
View file

@ -47,6 +47,8 @@ def split_csv(argument, required):
"a non-empty list required; provide at least one value or remove"
" this option"
)
if not len(outlist) == len(set(outlist)):
raise ValueError("duplicate value detected")
return outlist
@ -73,10 +75,8 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
def run(self):
placeholder = todolist("")
placeholder["isc_filter_tags"] = set(self.options.get("filter_tags", []))
placeholder["isc_filter_blocks"] = set(
self.options.get("filter_blocks", [])
)
placeholder["isc_filter_tags"] = self.options.get("filter_tags", [])
placeholder["isc_filter_blocks"] = self.options.get("filter_blocks", [])
return [placeholder]
class ISCConfDomain(Domain):
@ -127,7 +127,7 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
@property
def isc_tags(self):
return set(self.options.get("tags", []))
return self.options.get("tags", [])
@property
def isc_short(self):
@ -475,11 +475,11 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
lambda item: (
(
not acceptable_tags
or item["tags"].intersection(acceptable_tags)
or set(item["tags"]).intersection(acceptable_tags)
)
and (
not acceptable_blocks
or item["block_names"].intersection(
or set(item["block_names"]).intersection(
acceptable_blocks
)
)