From: Petr Špaček <pspacek@isc.org>
Date: Thu, 30 Jun 2022 09:48:16 +0000 (+0200)
Subject: Special-case zone in-view
X-Git-Tag: v9.19.3~16^2~7
X-Git-Url: http://git.ipfire.org/gitweb/?a=commitdiff_plain;h=261bdc7358630abb12b1423b68efbd4409bec9fc;p=thirdparty%2Fbind9.git

Special-case zone in-view

It is not really a zone type, so let's not generate "type in-view"
anchor for it.
---

diff --git a/doc/arm/_ext/iscconf.py b/doc/arm/_ext/iscconf.py
index d7f1e495de3..809445ec504 100644
--- a/doc/arm/_ext/iscconf.py
+++ b/doc/arm/_ext/iscconf.py
@@ -145,8 +145,11 @@ def domain_factory(domainname, domainlabel, todolist, grammar):
                     try:
                         zone_idx = path.index("zone")
                         zone_type_txt = path[zone_idx + 1]
-                        assert zone_type_txt.startswith("type "), zone_type_txt
-                        zone_types.add(zone_type_txt[len("type ") :])
+                        if zone_type_txt.startswith("type "):
+                            zone_types.add(zone_type_txt[len("type ") :])
+                        else:
+                            assert zone_type_txt == "in-view"
+                            zone_types.add(zone_type_txt)
                     except (ValueError, IndexError):
                         nozone_paths.append(path)
                 condensed_paths = nozone_paths[:]
diff --git a/doc/arm/_ext/mergegrammar.py b/doc/arm/_ext/mergegrammar.py
index 966d1c3bc95..b0500eb4b5b 100644
--- a/doc/arm/_ext/mergegrammar.py
+++ b/doc/arm/_ext/mergegrammar.py
@@ -22,7 +22,11 @@ import parsegrammar
 def read_zone():
     zone_grammars = {}
     for file in Path("../misc/").glob("*.zoneopt"):
-        zone_type = f"type {file.stem}"
+        # in-view is not really a zone type
+        if file.stem == "in-view":
+            zone_type = "in-view"
+        else:
+            zone_type = f"type {file.stem}"
 
         with file.open(encoding="ascii") as fp:
             zonegrammar = parsegrammar.parse_mapbody(fp)