diff options
| author | Stig Thormodsrud <stig@vyatta.com> | 2010-03-24 17:13:11 -0700 |
|---|---|---|
| committer | Stig Thormodsrud <stig@vyatta.com> | 2010-03-24 17:13:11 -0700 |
| commit | a4b59a1aaa10c4f78b5d854aa884decb17b8aea9 (patch) | |
| tree | d556d32de2cfae95e1be161b005ce4cf89c8849a /lib/Vyatta/ConfigLoad.pm | |
| parent | 7a9f88c587187ece112e47d7c4d077e44a6afe8a (diff) | |
| parent | 327ea4113cea590f4d2c33bb430421158ebf51fa (diff) | |
| download | vyatta-cfg-a4b59a1aaa10c4f78b5d854aa884decb17b8aea9.tar.gz vyatta-cfg-a4b59a1aaa10c4f78b5d854aa884decb17b8aea9.zip | |
Merge branch 'larkspur' of http://git.vyatta.com/vyatta-cfg into larkspur
Diffstat (limited to 'lib/Vyatta/ConfigLoad.pm')
| -rwxr-xr-x | lib/Vyatta/ConfigLoad.pm | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/Vyatta/ConfigLoad.pm b/lib/Vyatta/ConfigLoad.pm index 44c1089..627b361 100755 --- a/lib/Vyatta/ConfigLoad.pm +++ b/lib/Vyatta/ConfigLoad.pm @@ -315,7 +315,8 @@ sub findSetNodes { $active_cfg->setLevel(join ' ', @active_path); my @active_nodes = $active_cfg->listOrigNodes(); my %active_hash = map { $_ => 1 } @active_nodes; - if (defined($active_hash{'node.val'})) { + my $nref = $active_cfg->parseTmplAll(join ' ', @active_path); + if (defined($nref->{type}) and !defined($nref->{tag})) { # we are at a leaf node. findSetValues($new_ref, \@active_path); return; |