summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorChristian Poessinger <christian@poessinger.com>2021-08-22 20:51:55 +0200
committerChristian Poessinger <christian@poessinger.com>2021-08-22 20:51:55 +0200
commite99cdf40c72dec8b9019eca728aaad0f82c6030b (patch)
treeae12a5de096eb27c1ff16fe43e791906c1190f65
parent1b0d7b9e027672a95535d18e550919aff7e41ee3 (diff)
downloadvyos-1x-e99cdf40c72dec8b9019eca728aaad0f82c6030b.tar.gz
vyos-1x-e99cdf40c72dec8b9019eca728aaad0f82c6030b.zip
Makefile: T3165: do not allow empty node.def files for op-mode commands
Commit 99440fc0 ("Makefile: fix logic to detect empty "node.def" files") disabled the detection of empty node.def files for op-mode commands. The generation of a duplicate and thus empty node.def file is not prohibited by commit 17b5ac14 ("T3165: op-mode: prevent override of populated node.def file with empty content") and thus the check is re-enabled!
-rw-r--r--Makefile2
1 files changed, 1 insertions, 1 deletions
diff --git a/Makefile b/Makefile
index 2c79f545d..b582ef84c 100644
--- a/Makefile
+++ b/Makefile
@@ -61,7 +61,7 @@ op_mode_definitions: $(op_xml_obj)
# XXX: test if there are empty node.def files - this is not allowed as these
# could mask help strings or mandatory priority statements
- #find $(OP_TMPL_DIR) -name node.def -type f -empty -exec false {} + || sh -c 'echo "There are empty node.def files! Check your interface definitions." && exit 1'
+ find $(OP_TMPL_DIR) -name node.def -type f -empty -exec false {} + || sh -c 'echo "There are empty node.def files! Check your interface definitions." && exit 1'
.PHONY: vyshim
vyshim: