diff options
| author | Tom Grennan <tgrennan@vyatta.com> | 2008-01-03 17:19:42 -0800 |
|---|---|---|
| committer | Tom Grennan <tgrennan@vyatta.com> | 2008-01-03 17:19:42 -0800 |
| commit | fabea89d2586a33fb14c8e8fc489dd5fccab803d (patch) | |
| tree | f58c56fedf1b375d9585f60112ef2ef17862c374 /scripts/VyattaConfigLoad.pm | |
| parent | 62e9560404415217ffef5c547e28e96ddf2505a3 (diff) | |
| parent | d5b3e4d3c413cbf1a5295e51750258d014478857 (diff) | |
| download | vyatta-cfg-fabea89d2586a33fb14c8e8fc489dd5fccab803d.tar.gz vyatta-cfg-fabea89d2586a33fb14c8e8fc489dd5fccab803d.zip | |
Merge branch 'glendale' of http://suva.vyatta.com/vyatta-cfg into glendale
Diffstat (limited to 'scripts/VyattaConfigLoad.pm')
| -rwxr-xr-x | scripts/VyattaConfigLoad.pm | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/scripts/VyattaConfigLoad.pm b/scripts/VyattaConfigLoad.pm index eae2946..efec951 100755 --- a/scripts/VyattaConfigLoad.pm +++ b/scripts/VyattaConfigLoad.pm @@ -209,7 +209,7 @@ sub findDeletedValues { # for "multi:" nodes, need to sort the values by the original order. my @nvals = getSortedMultiValues($new_ref, \@active_path); if ($is_text) { - @nvals = map { /^"(.*)"$/; $1; } @nvals; + @nvals = map { /^"(.*)"$/ ? $1 : $_ }@nvals; } my @ovals = $active_cfg->returnOrigValues(''); my %comp_hash = $active_cfg->compareValueLists(\@ovals, \@nvals); @@ -261,7 +261,7 @@ sub findSetValues { # for "multi:" nodes, need to sort the values by the original order. my @nvals = getSortedMultiValues($new_ref, \@active_path); if ($is_text) { - @nvals = map { /^"(.*)"$/; $1; } @nvals; + @nvals = map { /^"(.*)"$/ ? $1 : $_ } @nvals; } my @ovals = $active_cfg->returnOrigValues(''); my %comp_hash = $active_cfg->compareValueLists(\@ovals, \@nvals); |