From ea35feb500826cc136707f40b7307b11cbc4e085 Mon Sep 17 00:00:00 2001 From: John Estabrook Date: Thu, 12 Oct 2023 10:00:56 -0500 Subject: xml: T5649: catch errors from schema validation before generating cache (cherry picked from commit 126a67ade9cd045e0ff60b0b9eb9b5680e8a29d0) --- Makefile | 4 ++-- 1 file 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 -- cgit v1.2.3