From c1996ea96f991e641af8f62efa63a133db0f9814 Mon Sep 17 00:00:00 2001 From: slioch Date: Mon, 18 May 2009 13:42:52 -0700 Subject: now explicit root merge works up to first multinode with explicit path --- lib/Vyatta/ConfigLoad.pm | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'lib/Vyatta') diff --git a/lib/Vyatta/ConfigLoad.pm b/lib/Vyatta/ConfigLoad.pm index a1c0b8f..09bd627 100755 --- a/lib/Vyatta/ConfigLoad.pm +++ b/lib/Vyatta/ConfigLoad.pm @@ -232,10 +232,13 @@ sub loadConfigHierarchy { my $xcp = new XorpConfigParser(); $xcp->parse($load_cfg); my $root; + my @root_path; if (defined($root_node)) { - my $tmp = [$root_node]; + my $tmp = [split("/",$root_node)]; $root = $xcp->get_node($tmp); - #root_path= --except last node and needs to be passed to enumerate_branch + my @tmp2 = split("/",$root_node); + @root_path = pop(@tmp2); + @root_path = @tmp2; } else { $root = $xcp->get_node( () ); @@ -243,7 +246,7 @@ sub loadConfigHierarchy { if (!defined($root)) { return (); } - enumerate_branch($root, ( )); + enumerate_branch($root, @root_path); return generateHierarchy(\@all_naked_nodes); } -- cgit v1.2.3