summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJohn Estabrook <jestabro@vyos.io>2023-10-12 13:56:08 -0500
committerGitHub <noreply@github.com>2023-10-12 13:56:08 -0500
commit4c062a3217d0a9ecb6efec83394b81732a173ae5 (patch)
tree89a6b467e03b3aaafcc522fae5f247e2d707c57c
parent759c2d8afd09e394253fa09ae86cb2e97cc8a391 (diff)
parentea35feb500826cc136707f40b7307b11cbc4e085 (diff)
downloadvyos-1x-4c062a3217d0a9ecb6efec83394b81732a173ae5.tar.gz
vyos-1x-4c062a3217d0a9ecb6efec83394b81732a173ae5.zip
Merge pull request #2360 from vyos/mergify/bp/sagitta/pr-2358
xml: T5649: catch errors from schema validation before generating cache (backport #2358)
-rw-r--r--Makefile4
1 files changed, 2 insertions, 2 deletions
diff --git a/Makefile b/Makefile
index 97f4de6c7..1a08d1680 100644
--- a/Makefile
+++ b/Makefile
@@ -26,10 +26,10 @@ interface_definitions: $(config_xml_obj)
$(CURDIR)/scripts/override-default $(BUILD_DIR)/interface-definitions
- $(CURDIR)/python/vyos/xml_ref/generate_cache.py --xml-dir $(BUILD_DIR)/interface-definitions || exit 1
-
find $(BUILD_DIR)/interface-definitions -type f -name "*.xml" | xargs -I {} $(CURDIR)/scripts/build-command-templates {} $(CURDIR)/schema/interface_definition.rng $(TMPL_DIR) || exit 1
+ $(CURDIR)/python/vyos/xml_ref/generate_cache.py --xml-dir $(BUILD_DIR)/interface-definitions || exit 1
+
# XXX: delete top level node.def's that now live in other packages
# IPSec VPN EAP-RADIUS does not support source-address
rm -rf $(TMPL_DIR)/vpn/ipsec/remote-access/radius/source-address