From d66832a5e058f26b13d37231e3b1ec065ce97025 Mon Sep 17 00:00:00 2001 From: Christian Poessinger Date: Thu, 30 May 2019 11:06:18 +0200 Subject: T1419: multiple passive-interfaces can't be deleted in one commit Reproduce with: set protocols ospf passive-interface default set protocols ospf passive-interface-exclude eth1 set protocols ospf passive-interface-exclude eth2.5 commit delete protocols ospf passive-interface default delete protocols ospf passive-interface-exclude eth1 delete protocols ospf passive-interface-exclude eth2.5 commit Results in [ protocols ospf passive-interface default ] sh: line 8: [: eth1: unary operator expected (cherry picked from commit 8dc9ac88c2ab71a71ab6f532339cd4ab2b321a29) --- templates/protocols/ospf/passive-interface/node.def | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/templates/protocols/ospf/passive-interface/node.def b/templates/protocols/ospf/passive-interface/node.def index f73f9166..ed5d17cb 100644 --- a/templates/protocols/ospf/passive-interface/node.def +++ b/templates/protocols/ospf/passive-interface/node.def @@ -28,7 +28,7 @@ delete: if [ -z $VAR(@) ] else if [ "$VAR(@)" == "default" ] then - if [ $VAR(../passive-interface-exclude/@) ] + if [ ! -z "$VAR(../passive-interface-exclude/@)" ] then echo "Error: delete passive-interface-exclude before deleting passive-interface default"; exit 1; -- cgit v1.2.3