diff options
| author | Daniil Baturin <daniil@vyos.io> | 2025-06-26 15:30:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2025-06-26 15:30:38 +0100 |
| commit | 22c6a817faee11ef97bb33a5431d7467b683c2e6 (patch) | |
| tree | dc9a77123b62447d98225b5106f9ebba20264851 | |
| parent | 062f7f4e7cd7d71cba56d168f9f99344e9044b59 (diff) | |
| parent | 8f2eac38f1b7bb132bf7782596899315745a713a (diff) | |
| download | vyos-1x-22c6a817faee11ef97bb33a5431d7467b683c2e6.tar.gz vyos-1x-22c6a817faee11ef97bb33a5431d7467b683c2e6.zip | |
Merge pull request #4578 from dmbaturin/T7578-enforce-op-mode-path-uniqueness
build: T7578: fail the package build if there are non-unique op mode nodes
| -rw-r--r-- | Makefile | 2 | ||||
| -rwxr-xr-x | python/vyos/xml_ref/generate_op_cache.py | 1 |
2 files changed, 2 insertions, 1 deletions
@@ -69,7 +69,7 @@ op_mode_definitions: $(op_xml_obj) find $(BUILD_DIR)/op-mode-definitions/ -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-op-templates {} $(CURDIR)/schema/op-mode-definition.rng $(OP_TMPL_DIR) || exit 1 - $(CURDIR)/python/vyos/xml_ref/generate_op_cache.py --xml-dir $(BUILD_DIR)/op-mode-definitions || exit 1 + $(CURDIR)/python/vyos/xml_ref/generate_op_cache.py --check-path-ambiguity --xml-dir $(BUILD_DIR)/op-mode-definitions || exit 1 # XXX: tcpdump, ping, traceroute and mtr must be able to recursivly call themselves as the # options are provided from the scripts themselves diff --git a/python/vyos/xml_ref/generate_op_cache.py b/python/vyos/xml_ref/generate_op_cache.py index 117b080b4..29697dc58 100755 --- a/python/vyos/xml_ref/generate_op_cache.py +++ b/python/vyos/xml_ref/generate_op_cache.py @@ -280,6 +280,7 @@ def main(): else: print('Found the following duplicate paths:\n') print(out) + sys.exit(1) with open(op_ref_cache, 'w') as f: f.write('from vyos.xml_ref.op_definition import NodeData\n') |